Merge branch 'master' of https://git.maemo.org/projects/browser-switch