Commit b0f2ede9807465c3238f40ea00d7355f9de90856

Ralf Wildenhues 2010-07-31T17:02:43

Merge branch 'maint'