Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 8 Feb 2010 06:33:03 +0000 (07:33 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 8 Feb 2010 06:33:03 +0000 (07:33 +0100)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge