Merge branch 'config-ui' into c-implementation
[browser-switch] / browser
2009-12-11 Steven LuoInitial commit.