Commit d4c5a0072e2825d77f4dc228a2348051518a6692

Ralf Wildenhues 2010-04-25T18:49:18

Merge branch 'maint' into foo