Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 Aug 2010 05:26:21 +0000 (07:26 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 Aug 2010 05:26:21 +0000 (07:26 +0200)
commit180fdc19835d38962ada5e6d76f7c928082b6ebc
tree1eb99ba395692a6e061b5877e751bc0fb03b5694
parenta8b9a698afbbfb837779fe94066d39e4cbd0d1dd
parent67ddb9cca2b638b1cf71eb98e906260b83a38677
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix the broken unicode detection of ODBC driver.