Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration v4.8.0-beta
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 3 Jul 2011 11:46:09 +0000 (21:46 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 3 Jul 2011 11:46:09 +0000 (21:46 +1000)
commit1d5041c712acd10020c38a92f1eedc88368ca19f
treefb2d4e31c8232456d10bd70a67000076c8d2d48a
parent68ad4618e02d1686e37b979fbf1fd1f349aa6d4f
parent7f5797a784e237672f291055020ef4bbb6199893
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Fixing typo