Commit rest of changes intended for 2008-04-12 fixes.
Authored by: ashawley 2008-05-02
Parent: [r67]
Child: [r69]