Minor changes -- committing so I can merge again.
Authored by: mdboom 2007-09-13
Parent: [r3845]
Child: [r3847]