merge of trunk revisions 490-499 into winport branch
Authored by: slruiz1 2010-09-21
Parent: [r499]
Child: [r501]