Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 24 Jun 2010 09:50:57 +0000 (12:50 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 24 Jun 2010 09:50:57 +0000 (12:50 +0300)

Trivial merge