Merge branch 'maint' into branch-1.11
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Wed, 19 Jan 2011 18:47:24 +0000 (19:47 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Wed, 19 Jan 2011 18:47:24 +0000 (19:47 +0100)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge