From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Dec 2009 15:34:27 +0000 (+0100)
Subject: merge mainline into crypto
X-Git-Tag: 1.98~212^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d624c2949d502e3600ac153dcd7bea99103daa0;p=thirdparty%2Fgrub.git

merge mainline into crypto
---

7d624c2949d502e3600ac153dcd7bea99103daa0