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