From: Eric Blake <eblake@redhat.com>
Date: Thu, 25 Aug 2011 18:46:19 +0000 (-0600)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7122ebe28e35ff3d1226ecb2a70520f1bec14bc;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

a7122ebe28e35ff3d1226ecb2a70520f1bec14bc