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

Trivial merge