Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorJanne Kiiski <janne.kiiski@ixonos.com>
Tue, 23 Nov 2010 07:39:41 +0000 (09:39 +0200)
committerJanne Kiiski <janne.kiiski@ixonos.com>
Tue, 23 Nov 2010 07:39:41 +0000 (09:39 +0200)

Trivial merge