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

merge with mainline
---

8908e499371df5834ba52e2bc256df9724638ede