Merge branch 'master' of https://code.google.com/p/cryptsetup
authorArno Wagner <wagner.arno@gmail.com>
Tue, 22 May 2012 21:58:44 +0000 (23:58 +0200)
committerArno Wagner <wagner.arno@gmail.com>
Tue, 22 May 2012 21:58:44 +0000 (23:58 +0200)

Trivial merge