Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 6 Aug 2010 19:44:01 +0000 (21:44 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 6 Aug 2010 19:44:01 +0000 (21:44 +0200)
commitdada4b40410bf0a8d00d8b27facec2cd26c8aa39
treefef292fd62a099ad731c4404d267d972ba0141cf
parentf74062b38c05dcb9c187601ca922d9091ebf7360
parent926b43d4a4314a4b9eeb4241a36e35afc4fe581b
Merge branch 'maint'

Conflicts:
HACKING
ChangeLog
HACKING
lib/Automake/tests/Makefile.in
tests/Makefile.in