From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 12:01:25 +0000 (+0200)
Subject: Merge mainline into legacy_parser
X-Git-Tag: 1.99~490^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d06d22b0cb70b3249cf7ce357e27b7c3ecc8c1e;p=thirdparty%2Fgrub.git

Merge mainline into legacy_parser
---

2d06d22b0cb70b3249cf7ce357e27b7c3ecc8c1e