Merge branch 'maint' into branch-1.11
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 16 Apr 2011 10:49:56 +0000 (12:49 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 16 Apr 2011 10:49:56 +0000 (12:49 +0200)
1  2 
ChangeLog
Makefile.in
tests/Makefile.in

diff --cc ChangeLog
Simple merge
diff --cc Makefile.in
Simple merge
Simple merge