Complete the halfly integrated previous patch (part2)
Authored by: rbultje 2002-04-10
Parent: [r1382]
Child: [r1384]
