Commit 7f2d6fb3055fd21c6fbaf12842e52ef418d2b06c

Ralf Wildenhues 2010-01-17T12:08:50

Merge branch 'maint'