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

merge trunk
---

9e07f211281ca743680fe1165885e78ccbcbf364