From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 19:19:29 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~648^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be24791dd55cf5a36ea2f7a4cd09727d57b5511;p=thirdparty%2Fgrub.git

merge with mainline
---

2be24791dd55cf5a36ea2f7a4cd09727d57b5511