Commit b9ab6dd38be370a76db85c32e0c0ab9e7189eed6

Ralf Wildenhues 2011-01-02T06:12:13

Merge branch 'maint'