From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 08:51:56 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~593^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e77cc389d55af5e27c84c1b8b4ce6b0b976e9872;p=thirdparty%2Fgrub.git

merge with mainline
---

e77cc389d55af5e27c84c1b8b4ce6b0b976e9872