Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 19 Apr 2010 12:10:00 +0000 (15:10 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 19 Apr 2010 12:10:00 +0000 (15:10 +0300)

Trivial merge