Complete the halfly integrated previous patch (doh)
Authored by: rbultje 2002-04-10
Parent: [r1381]
Child: [r1383]
