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

Trivial merge