Commit edf2c191790d31a4359b0b380bef351547719ca3

Ralf Wildenhues 2011-04-16T12:50:09

Merge branch 'maint'