incorporate toolkit winstripe changes until 2011-02-13