Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Jan 2011 17:18:45 +0000 (03:18 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Jan 2011 17:18:45 +0000 (03:18 +1000)
commit6c52715202ad8fd3c3f4bb94207cb7627c12f995
tree221be03923196683759111c73f94bf47d71e815e
parentd888b168932fbdc65881ced1aa55165f286ea6d2
parent405aafcfe2d9d591d62c72f00bbc095c2ad52309
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Use runtime path instead of compile time on Maemo