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

diff --cc src/src.pro
index 3890c1f,2368dba..53abef3
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -95,14 -95,11 +95,11 @@@ HEADERS += ui/mainwindow.h 
      network/networkreply.h
  QT += network \
      webkit
 -DEFINES += QT_NO_DEBUG_OUTPUT
 +#DEFINES += QT_NO_DEBUG_OUTPUT
  
  maemo5 | simulator {
-     sbox | simulator {
-         DEFINES += SBOX
-         SOURCES += network/networkhandlerprivatestub.cpp
-         HEADERS += network/networkhandlerprivatestub.h
-     } else {
+     armel {
+         DEFINES += ARMEL
          INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
          SOURCES += network/networkhandlerprivate.cpp
          HEADERS += network/networkhandlerprivate.h