Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
commitf692eb8a65524f8ac166c660fbaa87f0dbfd8b79
authorMartin Smith <msmith@trolltech.com>
Wed, 20 May 2009 10:01:47 +0000 (20 12:01 +0200)
committerMartin Smith <msmith@trolltech.com>
Wed, 20 May 2009 10:01:47 +0000 (20 12:01 +0200)
tree4fc667e80df43e5ec458eea151da081ed1c78b01
parent387db114cf09e60b43b13c36c83ef8cf07ee6553
parent4a8c7e432931b27e7a5440a6d15bde999e962f35
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5