Merge commit 'afee77cd5721bd863a8a4649e7bec8b964547e3e'
authorYves Marcoz <yves@marcoz.org>
Sat, 5 Nov 2011 22:12:58 +0000 (15:12 -0700)
committerYves Marcoz <yves@marcoz.org>
Sat, 5 Nov 2011 22:12:58 +0000 (15:12 -0700)

Trivial merge