From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 10:13:21 +0000 (+0100)
Subject: merge mainline into bootcheck
X-Git-Tag: 1.99~629^2~117^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f2b45cbb97b62b2cf7bdd5bd7b0dd814a0e9a75;p=thirdparty%2Fgrub.git

merge mainline into bootcheck
---

9f2b45cbb97b62b2cf7bdd5bd7b0dd814a0e9a75