Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 09:00:01 +0000 (19:00 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 09:00:01 +0000 (19:00 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix QPainter::drawGlyphs() with non-affine transformation


Trivial merge