Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Aug 2010 21:52:53 +0000 (23:52 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Aug 2010 21:52:53 +0000 (23:52 +0200)
commit16fef95d4a990935f8257cb89df0d36846d1179b
treeb60402549afe20963f8788a5b0e042b90b89bb45
parent8426abf367684205515a97953e862d28855a1749
parentd0dd88f36a8ccc9b3c7b799b0e95b55c98fee40d
Merge branch 'maint'

Conflicts:
tests/acloca18.test
tests/condinc2.test
ChangeLog
HACKING
tests/Makefile.am
tests/Makefile.in
tests/acloca18.test
tests/condinc2.test
tests/confdeps.test