From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 3 Mar 2010 10:24:36 +0000 (+0100)
Subject: merge mainline into sparc-mkimage
X-Git-Tag: 1.99~1020^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14532662eeb5dd8fed04eafaa53595780cec6428;p=thirdparty%2Fgrub.git

merge mainline into sparc-mkimage
---

14532662eeb5dd8fed04eafaa53595780cec6428