From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 20 Sep 2010 10:23:10 +0000 (+0200)
Subject: merge mainline into gingold3
X-Git-Tag: 1.99~458^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774b7ca021fc5c7695fba61f9378a6eb40e86765;p=thirdparty%2Fgrub.git

merge mainline into gingold3
---

774b7ca021fc5c7695fba61f9378a6eb40e86765