Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
authorEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 12:52:30 +0000 (15:52 +0300)
committerEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 12:52:30 +0000 (15:52 +0300)

Trivial merge