Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 14:09:02 +0000 (00:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 14:09:02 +0000 (00:09 +1000)
commitbf19972116767175710066ad59ce93b214b26d4a
treeddb3cadea28e9d48e085673a85ff6692279e3582
parentc8cd071d40ce58d2947639de4705bf547c4a0fca
parent022a528dfd3b768d36c396e00d01fbd3fc2e9f9c
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  compile openvg with private headers