Merge commit 'mouraf/for-erwan' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 9 May 2009 02:24:10 +0000 (19:24 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 9 May 2009 02:24:10 +0000 (19:24 -0700)

Trivial merge