Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
authoraavit <qt-info@nokia.com>
Wed, 24 Aug 2011 13:09:40 +0000 (15:09 +0200)
committeraavit <qt-info@nokia.com>
Wed, 24 Aug 2011 13:09:40 +0000 (15:09 +0200)
commitb8976735d780b17a4a64b84dd643ea87974e39ed
tree650739ea90e7b6a2c9df6ca4a1b1e3de10adbbca
parent02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339
parentf9a2b1618ef67f6be0f986b24e75d138d20ee6c7
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team