Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Nov 2011 08:49:08 +0000 (18:49 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Nov 2011 08:49:08 +0000 (18:49 +1000)
commit0a502ef47f1c6bf06c28dd966b63e3963cd2f630
tree60046ffdb8a74aadff344e6b879e50fe40aaa2a7
parent5dda0170988d7b9207e5aac31b624645ac797d8b
parent8ad39fcd26472d24c35444635ee0b6615d2c8170
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: