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