From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 4 May 2011 20:51:47 +0000 (+0200)
Subject: Merge branch 'maint' into java-work
X-Git-Tag: ng-0.5a~123^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2e5b4c334e7af191df3b6dfcc82001030447bc;p=thirdparty%2Fautomake.git

Merge branch 'maint' into java-work
---

2c2e5b4c334e7af191df3b6dfcc82001030447bc