From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Jun 2011 20:20:50 +0000 (+0200)
Subject: merge mainline into net
X-Git-Tag: 2.00~1167^2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f72becdef3f8433496e2bd4355370b4f3c4213e;p=thirdparty%2Fgrub.git

merge mainline into net
---

8f72becdef3f8433496e2bd4355370b4f3c4213e