merge of trunk revisions 430-490 into winport branch
Authored by: slruiz1 2010-09-17
Parent: [r498]
Child: [r500]