Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorJason McDonald <jason.mcdonald@nokia.com>
Fri, 13 May 2011 00:42:41 +0000 (10:42 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Fri, 13 May 2011 00:42:41 +0000 (10:42 +1000)

Trivial merge