Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 4 Apr 2010 06:44:53 +0000 (08:44 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 4 Apr 2010 06:44:53 +0000 (08:44 +0200)
1  2 
ChangeLog
Makefile.am
Makefile.in

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