From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Oct 2011 11:32:40 +0000 (+0200)
Subject: merge mainline into net
X-Git-Tag: 2.00~851^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa6b91afe97073e77073270bcd99cf598b3e3867;p=thirdparty%2Fgrub.git

merge mainline into net
---

aa6b91afe97073e77073270bcd99cf598b3e3867