Commit 67211bd93c06b64f7a58fc266a8f9dcbbf24b2f5

Ralf Wildenhues 2010-08-16T22:26:23

Merge branch 'maint'