From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 23 Dec 2010 12:20:48 +0000 (+0000)
Subject: merge trunk
X-Git-Tag: 2.00~1156^2~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d46121efbc724f0b2a7e9a14570d06ba5568c32;p=thirdparty%2Fgrub.git

merge trunk
---

6d46121efbc724f0b2a7e9a14570d06ba5568c32