Commit 9bd82c3443fe456fc6c81564e13595eab50621bb

Ralf Wildenhues 2010-05-23T17:22:29

Merge branch 'maint'