Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Thu, 10 Jun 2010 07:09:31 +0000 (10:09 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Thu, 10 Jun 2010 07:09:31 +0000 (10:09 +0300)

Trivial merge