Commit d4c4b5dd1a131392d28d7c77c054f9b4dcc17f82

Ralf Wildenhues 2009-05-24T14:46:45

Merge branch 'maint'