merge browser winstripe changes up to 2011-01-23