From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 25 Jun 2011 16:32:34 +0000 (+0200)
Subject: Merge branch 'master' into sfdisk
X-Git-Tag: v2.20-rc1~131^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c1fe7ec5ca05dabd79bc8f9b16c7270c4d4cf17;p=thirdparty%2Futil-linux.git

Merge branch 'master' into sfdisk
---

3c1fe7ec5ca05dabd79bc8f9b16c7270c4d4cf17