From: Szymon Janc <szymon@janc.net.pl>
Date: Tue, 4 Oct 2011 18:21:12 +0000 (+0200)
Subject: merge trunk
X-Git-Tag: 2.00~1106^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=709e61a55ffae4a870e250c358b167cb64ae5e74;p=thirdparty%2Fgrub.git

merge trunk
---

709e61a55ffae4a870e250c358b167cb64ae5e74