Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 26 Nov 2011 19:08:45 +0000 (05:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 26 Nov 2011 19:08:45 +0000 (05:08 +1000)
commitf48870f8efbcf7ca4e344e48e4f61334f35b9c6c
treedd0742d8d8f1ac20b78a5142b81a78ad89158b5c
parent58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc
parenta7e1ff2b3fc0b5d6cad039f3fe19e31b12089250
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

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