Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 6 Jun 2010 12:47:45 +0000 (14:47 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 6 Jun 2010 12:47:45 +0000 (14:47 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge