Testing: merge through r6010 from trunk (no test case; this is multi-project
related)
Authored by: ecarter 2007-09-20
Parent: [r6030]
Child: [r6032]