Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 22 Jun 2010 13:19:27 +0000 (16:19 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 22 Jun 2010 13:19:27 +0000 (16:19 +0300)

Trivial merge