Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 4 Jun 2010 10:58:42 +0000 (13:58 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 4 Jun 2010 10:58:42 +0000 (13:58 +0300)

Trivial merge