Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 01:48:59 +0000 (11:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 01:48:59 +0000 (11:48 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Make error checking in QSignalSpy consistent


Trivial merge