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

merge mainline into newreloc
---

ba2b9dc0a2f2aff89b96cbe4cf60fe4f6b020746