From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 31 Dec 2010 14:05:55 +0000 (+0100)
Subject: merge mainline into filesys
X-Git-Tag: 2.00~1262^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abafac997c4196ff2471e75f86dcb48ee30f06e2;p=thirdparty%2Fgrub.git

merge mainline into filesys
---

abafac997c4196ff2471e75f86dcb48ee30f06e2