Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Nov 2011 01:41:59 +0000 (11:41 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Nov 2011 01:41:59 +0000 (11:41 +1000)
commit1e0530130a8d2afeecfa60bb898c055d15ff8a82
tree948f45e2e7ed525b7536688b5ce4494abccc520d
parent526eda58dae96dca2c5aebcb48b007f09bd7ecac
parent6b6397f91125ddfc2abdea9704bbed08beb22ab7
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Hide png symbols in a namespace for -qt-libpng