From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 18:59:37 +0000 (+0100)
Subject: Merge mainline into emu-mod
X-Git-Tag: 1.99~1017^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64f832fffd57ef651400a1bde3476935917167b5;p=thirdparty%2Fgrub.git

Merge mainline into emu-mod
---

64f832fffd57ef651400a1bde3476935917167b5