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