Merge branch 'master' of https://vcs.maemo.org/git/situare into userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 17 May 2010 05:47:49 +0000 (08:47 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 17 May 2010 05:47:49 +0000 (08:47 +0300)

Trivial merge