From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 11 Sep 2010 16:03:47 +0000 (+0200)
Subject: merge mainline into gingold2
X-Git-Tag: 1.99~532^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ce9a743322e0e5ae1fbc0224c85e39484c310bb;p=thirdparty%2Fgrub.git

merge mainline into gingold2
---

4ce9a743322e0e5ae1fbc0224c85e39484c310bb