Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 11 Jun 2010 04:34:27 +0000 (06:34 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 11 Jun 2010 04:34:27 +0000 (06:34 +0200)
1  2 
ChangeLog
tests/defs.in

diff --cc ChangeLog
Simple merge
diff --cc tests/defs.in
Simple merge