Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 16 Feb 2010 20:09:09 +0000 (06:09 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Tue, 16 Feb 2010 20:09:09 +0000 (06:09 +1000)
commit757779ae3d27c260214f88411de81e1c32a688b5
treeab4954cf68ec794342b2f22730de87f858ed3ce2
parent1e7b737596db7be0a221aa44d1a329d3fdb5d6e3
parent95d3bd3fc993d7c8c1fe92960c617a3392d87f66
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6