From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 11 Nov 2011 23:42:18 +0000 (+0100)
Subject: merge mainline into fuse
X-Git-Tag: 2.00~956^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b93f1278a31d3c61e693e74eae4084b4c811917b;p=thirdparty%2Fgrub.git

merge mainline into fuse
---

b93f1278a31d3c61e693e74eae4084b4c811917b