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

merge mainline into scrollopt
---

b64e72394a3c81ab71e0c667277be27bce9494d1