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

Conflicts:
	src/src.pro

diff --cc images.qrc
index b311eaf,b311eaf..f407513
--- 1/images.qrc
--- 2/images.qrc
+++ b/images.qrc
@@@ -7,7 -7,7 +7,6 @@@
          <file>res/images/envelope.png</file>
          <file>res/images/zoom_in.png</file>
          <file>res/images/zoom_out.png</file>
--        <file>res/images/personal_info_bckgrnd.png</file>
          <file>res/images/refresh.png</file>
          <file>res/images/refresh_s.png</file>
          <file>res/images/send_position.png</file>

diff --cc src/src.pro
Simple merge