Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Wed, 20 Jul 2011 21:35:32 +0000 (23:35 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Wed, 20 Jul 2011 21:35:32 +0000 (23:35 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge