From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 5 Jan 2011 11:57:17 +0000 (+0000)
Subject: merge trunk
X-Git-Tag: 2.00~508^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e9f2bce87e433e9f310e1a73e48c68453d5555;p=thirdparty%2Fgrub.git

merge trunk
---

80e9f2bce87e433e9f310e1a73e48c68453d5555