Commit c3eab9af747bcb32d477fe242f6fd19d65fca323

Ralf Wildenhues 2010-10-02T18:43:01

Merge branch 'maint'