From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 14:54:01 +0000 (+0100)
Subject: merge mainline into ofwfb
X-Git-Tag: 1.99~1019^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e190e3d2cce2fbc0e0d8852e233cacf120af4761;p=thirdparty%2Fgrub.git

merge mainline into ofwfb
---

e190e3d2cce2fbc0e0d8852e233cacf120af4761