Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 28 Jun 2010 11:00:49 +0000 (14:00 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 28 Jun 2010 11:00:49 +0000 (14:00 +0300)

Trivial merge