Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 17:57:06 +0000 (03:57 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 17:57:06 +0000 (03:57 +1000)
commit4889729b32b30a4bad90a0add8ca444529dea2e7
tree86b67f93e6dcf7d38e10d54c4cce55f33c989b6b
parent935d4fc9504af2696f7d91b2074290b02f811da8
parentb554326134bab9ec0a9d8592c3052640ababd5cc
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: Fixup wrong code in patch baaa5ae