Commit eacde18ac1599b10a5b4f8fcc8ddb6543186a689

Ralf Wildenhues 2010-08-08T13:01:25

Merge branch 'maint'