From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 16 Dec 2009 16:52:17 +0000 (+0100)
Subject: merge mainline into videomask
X-Git-Tag: 1.98~174^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45da21ff5a374f6dc7d4d6800ff9fc4e710956cb;p=thirdparty%2Fgrub.git

merge mainline into videomask
---

45da21ff5a374f6dc7d4d6800ff9fc4e710956cb