Commit b068a03c2cba48e93c50376d02cf6cfb6a70e72e

Ralf Wildenhues 2011-01-13T20:23:36

Merge branch 'maint'