Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 10:26:33 +0000 (20:26 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 10:26:33 +0000 (20:26 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Rename QGlyphs -> QGlyphRun


Trivial merge