Commit fac422c8914f14acae106338ddd6efc0297c49e9

Ralf Wildenhues 2011-03-21T22:18:42

Merge branch 'maint'