From: Eric Blake <eblake@redhat.com>
Date: Fri, 17 Sep 2010 20:17:07 +0000 (-0600)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35597a759c91a414460eb8d4f9e138a64f317944;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

35597a759c91a414460eb8d4f9e138a64f317944
diff --cc automake.in
index 7798bb090,845ac7f67..3897de481
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in