Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc
authorMilan Broz <gmazyland@gmail.com>
Tue, 12 Jun 2012 16:05:00 +0000 (18:05 +0200)
committerMilan Broz <gmazyland@gmail.com>
Tue, 12 Jun 2012 16:05:00 +0000 (18:05 +0200)

Trivial merge