Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 20 Aug 2010 10:34:10 +0000 (13:34 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 20 Aug 2010 10:34:10 +0000 (13:34 +0300)

Trivial merge