From: Arno Wagner <wagner.arno@gmail.com>
Date: Tue, 24 Apr 2012 08:11:34 +0000 (+0200)
Subject: Merge branch 'master' of https://code.google.com/p/cryptsetup
X-Git-Tag: upstream/1.6~292
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fcryptsetup.git;a=commitdiff_plain;h=e48a808b5cb7d81b54b05757b80dcfd308c825c3

Merge branch 'master' of https://code.google.com/p/cryptsetup
---

e48a808b5cb7d81b54b05757b80dcfd308c825c3