Merge commit 'origin/4.5' into 4.6
authorJoerg Bornemann <joerg.bornemann@nokia.com>
Tue, 8 Sep 2009 07:34:01 +0000 (09:34 +0200)
committerJoerg Bornemann <joerg.bornemann@nokia.com>
Tue, 8 Sep 2009 07:34:01 +0000 (09:34 +0200)
commitb555f500f4ff2898b3dc7082590773132a1030f1
tree6380d406e5bba62cc968c8eafe2ca724e67e40a2
parent22e8dd8653281ebf79fc7fc0061b225c8daf2977
parent74fd14a305ce7402890de1919c3a27ac4d1cbf38
Merge commit 'origin/4.5' into 4.6

Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.cpp