Merge branch 'master' into diablo-package
[browser-switch] / browser
2009-12-11 Steven LuoInitial commit.