Somehow the merge went awry last time. Fixing.
Authored by: mdboom 2007-12-10
Parent: [r4690]
Child: [r4692]