From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 14 Nov 2011 13:30:14 +0000 (+0100)
Subject: merge mainline into backtrace
X-Git-Tag: 2.00~556^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab4378ae61ec02d1bcd4d4e7b744a4fa42ae70bd;p=thirdparty%2Fgrub.git

merge mainline into backtrace
---

ab4378ae61ec02d1bcd4d4e7b744a4fa42ae70bd