Merge commit 'remotes/staging/os1-4.7' into 4.7
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>
Fri, 13 Aug 2010 11:25:02 +0000 (13:25 +0200)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>
Fri, 13 Aug 2010 11:25:02 +0000 (13:25 +0200)
commit67a64e4c00fcbcc69d65d17ca5d62b82c9aa3cce
treeb5d58d12154116614362768fb2d567c39a411394
parent167b63d2250e7923d7b660076a80e82af07d9cdb
parent54a00f6992e20e7fdb8dd69f2b53e08bf7106be3
Merge commit 'remotes/staging/os1-4.7' into 4.7
src/corelib/tools/qstring.cpp