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

Trivial merge