From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 20 Sep 2009 17:38:16 +0000 (+0200)
Subject: Merge branch 'mainline' into relocator
X-Git-Tag: 1.98~160^2~128^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2e29a2a377191477d8e09400d7d1adf697b9a2;p=thirdparty%2Fgrub.git

Merge branch 'mainline' into relocator
---

8f2e29a2a377191477d8e09400d7d1adf697b9a2
diff --cc gendistlist.sh
index 5fe5d186b,3278ed0b3..3278ed0b3
mode 100644,100644..100755
--- a/gendistlist.sh
+++ b/gendistlist.sh