Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 08:08:20 +0000 (09:08 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 08:08:20 +0000 (09:08 +0100)
commit5200f708c46d4bc737d6706691965c726c063292
tree6e2e8dee38be3224e765cfba26048399ad1ffad8
parentcb34d11e4c98e768432e00c867b3321d3b89dd9d
parente1cde7c26b4923299b78e6165416788fbf8cd30e
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  fix inf loop bug