Testing: Merge 5755-5757,5759-5762 from trunk, leaving [5754] for now since it
has a failing unittest.
Authored by: ecarter 2007-06-27
Parent: [r5764]
Child: [r5766]