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

merge mainline into emu-mod
---

a73d26ead325258c3890df64b2e51d5e5c01ec33