Commit b3f8778bd870913efbf5799cb9a10285a9476b7f

Ralf Wildenhues 2009-12-05T15:11:07

Merge branch 'maint'