Timestamp conflict.
No functional change.
Authored by: keess 2003-02-03
Parent: [r407]
Child: [r409]
