Commit 915d00c655eb3eebc7b9ca7a0b2dfd76ccc87b2a

Ralf Wildenhues 2010-06-06T12:45:07

Merge branch 'maint'