Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 18 Sep 2009 18:15:28 +0000 (20:15 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 18 Sep 2009 18:15:28 +0000 (20:15 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge