From: BVK Chaitanya <bvk@dbook>
Date: Thu, 12 Aug 2010 03:46:24 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~668^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4962a2032f5ef796672f6cc2a9285ef70f090a89;p=thirdparty%2Fgrub.git

merge with mainline
---

4962a2032f5ef796672f6cc2a9285ef70f090a89