From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 18:28:30 +0000 (+0200)
Subject: merge mainline into sparcfixes
X-Git-Tag: 1.99~941^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06f1ed913e6274cefec145f37649e966209c09ca;p=thirdparty%2Fgrub.git

merge mainline into sparcfixes
---

06f1ed913e6274cefec145f37649e966209c09ca