From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 12:30:07 +0000 (+0200)
Subject: merge mainline into newreloc
X-Git-Tag: 1.99~629^2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5779bae94c0e86130c7bc0e67cdee540af68efb3;p=thirdparty%2Fgrub.git

merge mainline into newreloc
---

5779bae94c0e86130c7bc0e67cdee540af68efb3