Merge branch 'master' into lampehe
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Fri, 16 Apr 2010 12:20:13 +0000 (15:20 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Fri, 16 Apr 2010 12:20:13 +0000 (15:20 +0300)
commit527d1401c74dc8ca7c7f1ed5978229f994b9624d
treec99bf104662bb19b2e12babe35c5b399b8ccd9eb
parent83d9d4fb5308f77c82770081cab2a73113ddedc9
parent99eec5799d3d8b5a31a171c38d96aaeb82211c9c
Merge branch 'master' into lampehe

Conflicts:
src/src.pro
tests/cookiehandler/testcookiehandler.cpp
tests/testUI/testtabs/testtabs.cpp
tests/testmap/testmapview/testmapview.cpp
src/src.pro