From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 01:26:09 +0000 (+0200)
Subject: merge mainline into intwrap
X-Git-Tag: 1.99~619^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23e2a517adb0880c909d4a874864b2bcf5652c3a;p=thirdparty%2Fgrub.git

merge mainline into intwrap
---

23e2a517adb0880c909d4a874864b2bcf5652c3a