Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc