merge of trunk revisions 509-521 into winport branch.
Authored by: slruiz1 2010-10-02
Parent: [r521]
Child: [r523]