Merge commit 'pam/disklib-fixes'
authorErwan Velu <erwan.velu@free.fr>
Wed, 19 Aug 2009 19:17:49 +0000 (21:17 +0200)
committerErwan Velu <erwan.velu@free.fr>
Wed, 19 Aug 2009 19:17:49 +0000 (21:17 +0200)

Trivial merge