Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 12:04:01 +0000 (22:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 12:04:01 +0000 (22:04 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range


Trivial merge