Commit 2f9c8a78fa5da49a4974670037e362a77880e6ea

Ralf Wildenhues 2010-08-08T22:32:23

Merge branch 'maint'