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

Merge mainline into ofwfb
---

a1cb3e3811f9f6ee9b023b3ec66a46c903aced4c