Commit b6ee460304679c2d2f39a28004b9286b8ecbf8ea

Ralf Wildenhues 2010-11-14T18:04:58

Merge branch 'maint'