Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 02:18:56 +0000 (12:18 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 02:18:56 +0000 (12:18 +1000)
commit240e35ddeb6a71c99bcef53eccee206b02d72d85
tree3d765109a5ec53cac23f011677debec178b60005
parentff08e8c009323eadd3df79100979cbb937d8e1e3
parent66498850f2d5cf3a41579323c5119a7b6c9ce830
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Allow arthur tests to use private headers.