From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 19:41:43 +0000 (+0200)
Subject: merge mainline into newreloc
X-Git-Tag: 1.99~629^2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e96ee4339f246588ac6a3c55d84519c3227a40ca;p=thirdparty%2Fgrub.git

merge mainline into newreloc
---

e96ee4339f246588ac6a3c55d84519c3227a40ca