From: Felix Zielcke <fzielcke@z-51.de>
Date: Sun, 29 Nov 2009 14:09:08 +0000 (+0100)
Subject: Merge trunk
X-Git-Tag: 1.99~723^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af140ecd484105e2763f1229d392474ccd5c14ef;p=thirdparty%2Fgrub.git

Merge trunk
---

af140ecd484105e2763f1229d392474ccd5c14ef