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

Trivial merge