Testing: Merge through [6139], including the changes in [6513] to make all
tests pass. Also required changing the expected URL for two testcases to not expect a trailing '/'.
Authored by: ecarter 2008-02-17
Parent: [r6513]
Child: [r6515]