From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 20:34:59 +0000 (+0200)
Subject: merge mainline into newreloc
X-Git-Tag: 1.99~629^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72d14db9ba3ec620cffb92d65bb356839f8b8f26;p=thirdparty%2Fgrub.git

merge mainline into newreloc
---

72d14db9ba3ec620cffb92d65bb356839f8b8f26