From: Jussi Laitinen <jupe@l3l7588.ixonos.local>
Date: Tue, 22 Jun 2010 12:40:05 +0000 (+0300)
Subject: Merge branch 'master' into map_double_click_zoom
X-Git-Tag: v1.0~8^2~3^2~4
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=979ff655fedc4d057321debc43743b5c9a8abe33

Merge branch 'master' into map_double_click_zoom

Conflicts:
	src/map/mapview.cpp
	src/src.pro
---

979ff655fedc4d057321debc43743b5c9a8abe33