From: Szymon Janc <szymon@janc.net.pl>
Date: Sat, 20 Aug 2011 10:02:35 +0000 (+0200)
Subject: merge trunk
X-Git-Tag: 2.00~1106^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3e9c48799f6e4002a540320383e3d48d1cf1998;p=thirdparty%2Fgrub.git

merge trunk
---

b3e9c48799f6e4002a540320383e3d48d1cf1998