Commit a0a47d08dd6cc286e91b90ecd7c86ed1dd5ba8a0

Ralf Wildenhues 2009-07-09T08:06:06

Merge branch 'maint'