Merge remote-tracking branch 'woodchuck/master'
authorYves Marcoz <yves@marcoz.org>
Mon, 19 Sep 2011 23:12:24 +0000 (16:12 -0700)
committerYves Marcoz <yves@marcoz.org>
Mon, 19 Sep 2011 23:12:24 +0000 (16:12 -0700)

Trivial merge