Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 9 Apr 2010 09:34:48 +0000 (12:34 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 9 Apr 2010 09:34:48 +0000 (12:34 +0300)

Trivial merge