From: Felix Zielcke <fzielcke@z-51.de>
Date: Wed, 23 Dec 2009 17:09:30 +0000 (+0100)
Subject: Merge trunk
X-Git-Tag: 1.99~723^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e7d9be094b190d6738afd5452cd450dc8ee846e;p=thirdparty%2Fgrub.git

Merge trunk
---

0e7d9be094b190d6738afd5452cd450dc8ee846e