From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 11 Jan 2011 16:00:45 +0000 (-0600)
Subject: merge trunk
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6b978c4f04be82e92fcdb9afcce6c18af65f8e74;p=grub2.git

merge trunk
---

6b978c4f04be82e92fcdb9afcce6c18af65f8e74