Commit 2b0687bb9db3b34ccb0de7bebd4769f635ae1fd1

Ralf Wildenhues 2011-07-20T23:35:32

Merge branch 'maint'