Testing: Merge [6535] (excluding [6120] and [6122]) from trunk. Updated testcases to expect a trailing '/' on urls. All tests pass.
Authored by: ecarter 2008-02-19
Parent: [r6539]
Child: [r6541]