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

merge with mainline
---

9444311834bb1dd822ed5a89e600906432f23742