Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 19 Nov 2010 14:22:02 +0000 (16:22 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 19 Nov 2010 14:22:02 +0000 (16:22 +0200)

Trivial merge