From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 25 Oct 2010 11:19:10 +0000 (+0200)
Subject: merge mainline into net
X-Git-Tag: 2.00~1195^2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc5aeea5b952fbe3631cdfd5325f518c3e948af7;p=thirdparty%2Fgrub.git

merge mainline into net
---

dc5aeea5b952fbe3631cdfd5325f518c3e948af7