Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorRhys Weatherley <rhys.weatherley@nokia.com>
Wed, 9 Sep 2009 23:06:23 +0000 (09:06 +1000)
committerRhys Weatherley <rhys.weatherley@nokia.com>
Wed, 9 Sep 2009 23:06:23 +0000 (09:06 +1000)
commitad1db6e7046cc5bc1060c476abdfd92366f68edc
tree250075f3e1ff6e5973d3ddd8eb56a12484838ae5
parenteba8265bf16468fe8d67864b939293565d3fa0c8
parenta08aa0b58ecbc59b77fe545898987bbff31fddd0
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6