Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Thu, 24 Jun 2010 19:37:04 +0000 (21:37 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Thu, 24 Jun 2010 19:37:04 +0000 (21:37 +0200)
1  2 
ChangeLog
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
Simple merge
Simple merge
Simple merge