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