Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 12:02:54 +0000 (22:02 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 12:02:54 +0000 (22:02 +1000)
commitc8cd071d40ce58d2947639de4705bf547c4a0fca
tree091fa858820373454124c1adcd309b8f76add5b3
parent948d5f22c309899657a9397e516d5892b02804c0
parent45b80f054fb729ec94714ee1a5f6145352be0296
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove misspelled comment in tst_qtextdocument.cpp