Merge commit 'origin/4.6' into bearermanagement/integration-4
authorAaron McCarthy <aaron.mccarthy@nokia.com>
Fri, 29 Jan 2010 03:47:42 +0000 (13:47 +1000)
committerAaron McCarthy <aaron.mccarthy@nokia.com>
Fri, 29 Jan 2010 03:47:42 +0000 (13:47 +1000)
commit350b0fadf3fbd12a278681513295577a066b0fb1
treef0ebad6693c3cf3b7754fb8187a6b320e5d4679f
parente4625e53aa893f7c59407913e743951294c7dafe
parent9d636095403f5abecbdff8ffffe658f35ff10001
Merge commit 'origin/4.6' into bearermanagement/integration-4

Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
tests/auto/auto.pro