From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 11 May 2013 08:24:37 +0000 (+0200)
Subject: merge mainline into arm
X-Git-Tag: grub-2.02-beta1~930^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c99b9d1fe82fd221633e94de628eb48c5b9f2f1;p=thirdparty%2Fgrub.git

merge mainline into arm
---

1c99b9d1fe82fd221633e94de628eb48c5b9f2f1