Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 12:59:44 +0000 (15:59 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 12:59:44 +0000 (15:59 +0300)

Trivial merge