Merge branch 'master' of https://code.google.com/p/cryptsetup
authorArno Wagner <wagner.arno@gmail.com>
Sun, 10 Jun 2012 15:59:00 +0000 (17:59 +0200)
committerArno Wagner <wagner.arno@gmail.com>
Sun, 10 Jun 2012 15:59:00 +0000 (17:59 +0200)

Trivial merge