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)
commit796ac719ba031943201c5fc3cf740dea50315414
treefabe9834ef542d9990d9b7af6acbd3e57e60509b
parent7f3b680fe2af99969da04c8fdd14966fdd1ce9f6
parentd72bfe6108c5104bb095f1c3f9f35885ddf8da88
Merge commit 'origin/for-erwan' into disklib