Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 8 Aug 2010 20:32:23 +0000 (22:32 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 8 Aug 2010 20:32:23 +0000 (22:32 +0200)
commit2f9c8a78fa5da49a4974670037e362a77880e6ea
treebca96583559154dfc1d90b7eafce5f282bc772e4
parenteacde18ac1599b10a5b4f8fcc8ddb6543186a689
parente9f3c00ace05be38caabbe29d668ad2c2cb2de9f
Merge branch 'maint'
ChangeLog