Minor tidying up after mergeing of stable/unstable for further development.
Authored by: wackston 2001-06-09
Parent: [r560]
Child: [r562]