Commit fcad1df725e0a143bd3e8e2f340961145d33b82a

Ralf Wildenhues 2010-04-20T07:47:11

Merge branch 'maint'