Merge branch 'master' of https://code.google.com/p/cryptsetup
authorMilan Broz <gmazyland@gmail.com>
Fri, 7 Dec 2012 14:57:00 +0000 (15:57 +0100)
committerMilan Broz <gmazyland@gmail.com>
Fri, 7 Dec 2012 14:57:00 +0000 (15:57 +0100)

Trivial merge