From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 14:04:32 +0000 (+0200)
Subject: merge mainline into newreloc
X-Git-Tag: 1.99~629^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5c8cf354ce777791f01dda7c9d8b206a287cd25;p=thirdparty%2Fgrub.git

merge mainline into newreloc
---

c5c8cf354ce777791f01dda7c9d8b206a287cd25