From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 18:12:26 +0000 (+0200)
Subject: Merge mainline into usb
X-Git-Tag: 1.99~654^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8161b08687f076cda31acea30a37c712d5f34b99;p=thirdparty%2Fgrub.git

Merge mainline into usb
---

8161b08687f076cda31acea30a37c712d5f34b99