From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jul 2011 23:35:41 +0000 (+0200)
Subject: merge mainline into net
X-Git-Tag: 2.00~1167^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d53bf34924b109dd3c9650daab40b5ba71bbd01b;p=thirdparty%2Fgrub.git

merge mainline into net
---

d53bf34924b109dd3c9650daab40b5ba71bbd01b