Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Thu, 17 Dec 2009 12:52:05 +0000 (13:52 +0100)
committerSimon Hausmann <simon.hausmann@nokia.com>
Thu, 17 Dec 2009 12:52:05 +0000 (13:52 +0100)
commit95661eddda8a161ecee90e14f44bd05509e21b11
treed17493be75f5a1f267abbf1e35ff40350bfdc796
parentb8a4b365b1105a742369bbaa5dc00e43914089e0
parent4b5b74835f6323415f7df43ddb74caa078c4ab62
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
src/network/kernel/kernel.pri