From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Mar 2012 20:47:00 +0000 (+0100)
Subject: merge mainline into reloc
X-Git-Tag: 2.00~437^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b81550843d01bd5efdfd70706fbdaaeb19652899;p=thirdparty%2Fgrub.git

merge mainline into reloc
---

b81550843d01bd5efdfd70706fbdaaeb19652899