continue winport merge; more patch from VY
Authored by: lilyco 2010-10-13
Parent: [r542]
Child: [r544]