Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 18 Jun 2010 12:35:57 +0000 (15:35 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 18 Jun 2010 12:48:43 +0000 (15:48 +0300)
Reviewed by Sami Rämö


Trivial merge