Testing: Merge through [6187] (excluding [6120] and [6122]) from trunk. All tests pass. Note that the behavior with an empty repository changed.
Authored by: ecarter 2008-02-17
Parent: [r6524]
Child: [r6526]