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

merge with mainline
---

b899201c6924a7c953eafd61c8df39ee6ed4fe49