Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Thu, 14 Jan 2010 08:48:16 +0000 (09:48 +0100)
committerSimon Hausmann <simon.hausmann@nokia.com>
Thu, 14 Jan 2010 08:48:16 +0000 (09:48 +0100)
commitcf74ef2ca9163ac6e15b6a218ef284f6104cdcab
tree68fc4ba63a8080917550f8c769c8c4e8f64f45a1
parent3531f4c831407016ef0735d9cdff9b193e4b3f92
parent862d5433fb694a03715b2327a107b3192b921924
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
dist/changes-4.6.1
dist/changes-4.6.1