Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Nov 2011 22:09:43 +0000 (08:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Nov 2011 22:09:43 +0000 (08:09 +1000)
commit31ec71c818424b4173b7a40d92887e4e6e5a6d7d
tree10a1207fc9bdea169fad3210048484d71ab3f7ef
parente6f5fc28e82732dd214d87bd6c6a8a2efbf89f14
parent537177299d2c0fa55eb552cbb0275f289bee2661
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix Symbian def-file