From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 27 May 2010 15:36:31 +0000 (+0100)
Subject: merge from mainline
X-Git-Tag: 1.99~861^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26c9e9bf61a14ab77c3a77185149b78c817cb59e;p=thirdparty%2Fgrub.git

merge from mainline
---

26c9e9bf61a14ab77c3a77185149b78c817cb59e