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

merge mainline into newreloc
---

32fa4348a3b60e031c68354f99d66262289c3a7d