Commit 9e966db97cd932b9e4a11ac260a0c5a49aac9c7f

Ralf Wildenhues 2010-03-28T18:06:22

Merge branch 'maint'