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 18:21:17 +0000 (04:21 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 18:21:17 +0000 (04:21 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Dont do doneCurrent in swapBuffers


Trivial merge