Merge branch 'master' of https://vcs.maemo.org/git/situare into map

diff --cc src/src.pro
index 4068f33,4f084e6..633c529
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -11,7 -12,9 +11,9 @@@ SOURCES += main.cpp 
      map/mapview.cpp \
      map/mapscene.cpp \
      map/maptile.cpp \
-     map/mapfetcher.cpp
 -    map/mapfetcher.cpp \
++    map/mapfetcher.cpp\
+     ui/pixmap.cpp \
+     ui/infotab.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -20,7 -23,9 +22,9 @@@
      map/mapscene.h \
      map/maptile.h \
      map/mapfetcher.h \
-     map/mapcommon.h
 -    common.h \
++    map/mapcommon.h \
+     ui/pixmap.h \
+     ui/infotab.h
  QT += network \
      webkit
  

diff --cc src/ui/mapviewscreen.cpp
Simple merge