Testing: Merge through r5927 from trunk
Authored by: ecarter 2007-08-15
Parent: [r5927]
Child: [r5929]