From: Felix Zielcke <fzielcke@z-51.de>
Date: Fri, 13 Nov 2009 13:15:36 +0000 (+0100)
Subject: Merge trunk
X-Git-Tag: 1.98~370^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4c62ed6ed7233c24ca2576f369d3274a70837aa;p=thirdparty%2Fgrub.git

Merge trunk
---

f4c62ed6ed7233c24ca2576f369d3274a70837aa