Merge branch 'master' of https://vcs.maemo.org/git/tomamp
[tomamp] / welcome