Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 09:25:06 +0000 (11:25 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 09:25:06 +0000 (11:25 +0200)
commit8e6b240eef98060737324e33b09f4323ced58213
tree4a9235518c3dadff2bc563a3b6ddd46b3bad878e
parent2044890bb807dc5879d7cbb1863c56c64249c3ef
parent51b6c8a6e2713f2b151a522c75b2db5f0b0b663e
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Implement some changes to the AIX xlC mkspec suggested by IBM.