Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 17 May 2010 13:09:51 +0000 (16:09 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 17 May 2010 13:09:51 +0000 (16:09 +0300)

Trivial merge