Merge changes from trunk: 5171,5173-5178,5182-5197
Authored by: ecarter 2007-04-13
Parent: [r5198]
Child: [r5200]