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, 13 Apr 2011 12:28:42 +0000 (22:28 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Apr 2011 12:28:42 +0000 (22:28 +1000)
commit662174b78b7e08c759d0086e215e81e9e0eaf0c5
tree3f503afdaef99dc3c0f8ec73cc1c9a26eee56b6d
parentafcf63661173b78623245b4892cd282f9c7d8986
parent4e2d549e8b2e34c5bd4c77a4a6eba99ed0912168
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:
  Remove a race condition in SIGCHLD handler.
  Fix warnings about && inside ||