From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 09:43:59 +0000 (+0200)
Subject: merge mainline into legacy_parser
X-Git-Tag: 1.99~490^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb2f2813fbebee63e9483529f9c3a6aba0edd8a;p=thirdparty%2Fgrub.git

merge mainline into legacy_parser
---

0cb2f2813fbebee63e9483529f9c3a6aba0edd8a