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

merge with mainline
---

965e0faac8389fe0d42de177d28ca43d59626ec1