From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 14:36:57 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~597^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dfb7ba053d11b336c0f1dee29b53ad91be1a887;p=thirdparty%2Fgrub.git

merge with mainline
---

0dfb7ba053d11b336c0f1dee29b53ad91be1a887