Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 8 Apr 2010 05:24:16 +0000 (08:24 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 8 Apr 2010 05:24:16 +0000 (08:24 +0300)

Trivial merge