Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorJanne Kiiski <janne.kiiski@ixonos.com>
Mon, 22 Nov 2010 14:03:37 +0000 (16:03 +0200)
committerJanne Kiiski <janne.kiiski@ixonos.com>
Mon, 22 Nov 2010 14:03:37 +0000 (16:03 +0200)

Trivial merge