From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 31 Jan 2010 00:59:35 +0000 (+0100)
Subject: Merge mainline into ofwfb
X-Git-Tag: 1.99~1019^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69efaa32d2b8380540eb3d190c8928df4f3e52fa;p=thirdparty%2Fgrub.git

Merge mainline into ofwfb
---

69efaa32d2b8380540eb3d190c8928df4f3e52fa