Commit 2eb4dd1be0fe520f77f53be13be5dd3ff7c201ca

Ralf Wildenhues 2010-01-17T11:30:57

Merge branch 'maint'