From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 20:53:43 +0000 (+0100)
Subject: merge mainline into bmpidx
X-Git-Tag: 1.98~136^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6d5d6e624ac5812aaab569e8059406eeaff2766;p=thirdparty%2Fgrub.git

merge mainline into bmpidx
---

e6d5d6e624ac5812aaab569e8059406eeaff2766