From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 13:00:44 +0000 (+0100)
Subject: Merge mainline into mbivid
X-Git-Tag: 1.99~460^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcc0c5a4434277816eb7bcd1af3575ab17f3763e;p=thirdparty%2Fgrub.git

Merge mainline into mbivid
---

dcc0c5a4434277816eb7bcd1af3575ab17f3763e