Milestone: Merge through r6005 from trunk
Authored by: ecarter 2007-09-11
Parent: [r6006]
Child: [r6008]