Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 24 Nov 2010 10:38:12 +0000 (12:38 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 24 Nov 2010 10:38:12 +0000 (12:38 +0200)

Trivial merge