Merge branch 'master' of https://git.maemo.org/projects/browser-switch
authorSteven Luo <steven+maemo@steven676.net>
Fri, 11 Dec 2009 00:20:53 +0000 (16:20 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 11 Dec 2009 00:20:53 +0000 (16:20 -0800)

Trivial merge