Testing: merge all revisions up to r5820 from trunk
Authored by: ecarter 2007-07-10
Parent: [r5821]
Child: [r5823]