From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 9 May 2010 09:03:03 +0000 (+0200)
Subject: merge mainline into bidi
X-Git-Tag: 1.99~763^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dcef22cd340617fce8db5cd52bd18d034e2be1b;p=thirdparty%2Fgrub.git

merge mainline into bidi
---

7dcef22cd340617fce8db5cd52bd18d034e2be1b