From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 21:23:00 +0000 (+0100)
Subject: Merge mainline into boottest
X-Git-Tag: 1.99~629^2~90^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de69d952cfb4027a5ca3fc966882638585da96ea;p=thirdparty%2Fgrub.git

Merge mainline into boottest
---

de69d952cfb4027a5ca3fc966882638585da96ea