From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 14:49:28 +0000 (+0100)
Subject: Merge mainline into mbivid
X-Git-Tag: 1.99~460^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54100be961a8b35f4f7e4a613228a1f8c4938191;p=thirdparty%2Fgrub.git

Merge mainline into mbivid
---

54100be961a8b35f4f7e4a613228a1f8c4938191