Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 16:11:15 +0000 (02:11 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 16:11:15 +0000 (02:11 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Prevent crash in OpenGL engine when scaling images / pixmaps.


Trivial merge