Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 21 Apr 2011 00:41:10 +0000 (10:41 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 21 Apr 2011 00:41:10 +0000 (10:41 +1000)
commita50e06247549dc32ff704d446f6a82ef3f8fb1ca
tree8770b9197b029e479d7aa9d1b9640cdc8eba6cf7
parent8234bbf293d6445ac969b1cf07325ad3fad6e407
parenta96bec4d709b01bb4616888f1c8584d03bc1d765
Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into 1.1-integration

* '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework:
  Revert "Enable 2 more autotests for harmattan"