From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 16:06:36 +0000 (+0100)
Subject: merge mainline into grub-file
X-Git-Tag: 1.99~1002^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07906901962bdfe34c528447b424c653f46104c0;p=thirdparty%2Fgrub.git

merge mainline into grub-file
---

07906901962bdfe34c528447b424c653f46104c0