Merge commit 'origin/for-erwan' into disklib
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 18 Apr 2009 18:39:09 +0000 (11:39 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 18 Apr 2009 18:39:09 +0000 (11:39 -0700)

Trivial merge