Commit c383211ab93ae36b3d9485da4101852db74ce0cc

Ralf Wildenhues 2011-01-24T21:43:41

Merge branch 'maint'