Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 19 Oct 2011 16:03:14 +0000 (02:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 19 Oct 2011 16:03:14 +0000 (02:03 +1000)
commitc14af1c242ea3b268a4b6a5df62869bfd0efb6c4
tree19c8ea6930ef2def91e9f2597aceb12c4306aac6
parent159572e52132067d74b39fb9209d72c20633bba4
parent55c2ea18c522bd8700f43884124e02b460cdb5e2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4