Merge branch 'userinfo' of https://vcs.maemo.org/git/situare into userinfo