From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 25 Nov 2009 21:34:53 +0000 (+0000)
Subject: Merge from trunk.
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e4612999e6a261afff69ae3dce9662ee40713fcf;p=grub2.git

Merge from trunk.
---

e4612999e6a261afff69ae3dce9662ee40713fcf