Merge commit 'v3.1' into fremantle-package
[browser-switch] / browser
2009-12-11 Steven LuoInitial commit.