From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 8 Sep 2010 18:40:27 +0000 (+0200)
Subject: merge mainline into nested
X-Git-Tag: 1.99~452^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dedb5f9be29d3b44f7f57d9619d43d3a2eb5be4b;p=thirdparty%2Fgrub.git

merge mainline into nested
---

dedb5f9be29d3b44f7f57d9619d43d3a2eb5be4b