Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
commiteaee2e3b70a5e245b82fa8991d7ff580e6e48132
authorMartin Smith <msmith@trolltech.com>
Tue, 19 May 2009 09:52:23 +0000 (19 11:52 +0200)
committerMartin Smith <msmith@trolltech.com>
Tue, 19 May 2009 09:52:23 +0000 (19 11:52 +0200)
treea86fa7fd804f80c30fe996f711aa02f2c00500b9
parentffecdf0bf9f25f7ab9aa4f69e37507dd595fecea
parentba5fb9f05c891feac8ab69006189de1aaafebc18
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5