Merge branch 'master' of ssh://drop.maemo.org/git/vicar