From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 14:41:30 +0000 (+0100)
Subject: Merge mainline into ofwclock
X-Git-Tag: 1.99~1018^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb46c85c0721f5c0e4a7b5aee36db5a07c5d0998;p=thirdparty%2Fgrub.git

Merge mainline into ofwclock
---

eb46c85c0721f5c0e4a7b5aee36db5a07c5d0998