Commit 8479c9adb993b3ce37c8dc112e294a80f82b4f32

Ralf Wildenhues 2010-05-23T14:32:39

Merge branch 'maint'