Commit f6b05bd1bce89168db265d8464464562c54fa72e

Ralf Wildenhues 2010-10-03T11:44:13

Merge branch 'maint'