From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 22:28:57 +0000 (+0200)
Subject: Merge mainline into mbivid
X-Git-Tag: 1.99~460^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9879bf2b600c260cb2201ce15cf282001ac2fd19;p=thirdparty%2Fgrub.git

Merge mainline into mbivid
---

9879bf2b600c260cb2201ce15cf282001ac2fd19