Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5

This commit is contained in:
Simo Fält
2012-03-29 13:35:06 +03:00