From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 6 Mar 2010 08:35:46 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~438
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59e07285a8e195ac3951208824d93f265ff89259;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

59e07285a8e195ac3951208824d93f265ff89259
diff --cc automake.in
index c0bf14687,503c22130..d5e3ec21c
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in