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