Merge branch 'master' of https://code.google.com/p/cryptsetup
authorArno Wagner <wagner.arno@gmail.com>
Tue, 24 Apr 2012 08:11:34 +0000 (10:11 +0200)
committerArno Wagner <wagner.arno@gmail.com>
Tue, 24 Apr 2012 08:11:34 +0000 (10:11 +0200)

Trivial merge