Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorSarah Smith <sarah.j.smith@nokia.com>
Thu, 10 Sep 2009 00:15:48 +0000 (10:15 +1000)
committerSarah Smith <sarah.j.smith@nokia.com>
Thu, 10 Sep 2009 00:15:48 +0000 (10:15 +1000)
commit9e43002b7d7319c143c97b707e095fef434d0af2
treea9601fb969dfef5a05c8ce70e85030ae1e3cacbb
parentc5be02430eda5a555114ef332a389b7621904b17
parent9fe43c999d3d9b21836345522bb67bab38e661af
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6