From: Felix Zielcke <fzielcke@z-51.de>
Date: Mon, 16 Nov 2009 20:53:32 +0000 (+0100)
Subject: Merge trunk
X-Git-Tag: 1.99~723^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e24b11dbee252973d87faf133eacb5fd55bb7c;p=thirdparty%2Fgrub.git

Merge trunk
---

a8e24b11dbee252973d87faf133eacb5fd55bb7c