Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 20 Jun 2010 18:32:53 +0000 (20:32 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 20 Jun 2010 18:32:53 +0000 (20:32 +0200)
commit7365964c1567882cb72a2a53ad58f5f0fb48a545
treedd640a3a22eb80d9dec43b14e6db37c319c301e2
parent219d3bf74649699272897f51086708454a972186
parente8413c400ac63bdc65a05851d23c2f076dcdee48
Merge branch 'maint'
ChangeLog