Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorJanne Kiiski <janne.kiiski@ixonos.com>
Wed, 24 Nov 2010 08:58:54 +0000 (10:58 +0200)
committerJanne Kiiski <janne.kiiski@ixonos.com>
Wed, 24 Nov 2010 08:58:54 +0000 (10:58 +0200)

Trivial merge