merge of trunk revisions 506-509 into winport branch.
Authored by: slruiz1 2010-09-27
Parent: [r509]
Child: [r511]