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)
commit49d4ef13d8071c9353354fd13df28ebd33db1b11
treeeee4d47e62d6c379b29baf7ac7595d487f224655
parent8ae4d0aab57e3f646f096b8b3b6297233e91753b
parentd652a1c0a5bf2f973c5328eed983b4df9ccd284f
Merge branch 'maint' into branch-1.11
ChangeLog