Commiting patch in #5950, created 2006-05-20 18:20