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, 10 Aug 2010 00:00:31 +0000 (02:00 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 Aug 2010 00:00:31 +0000 (02:00 +0200)
commit0bd5f5969c556f89bf146211772a315f25a23e99
treef75c573eba1ed9c64519cbb2d9630a1ce41ea83d
parente12448b0e00a70377591fbe9b3180dcb5f37e533
parent362641ec2bdf5e05b4adfc54275c1c4869759d56
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:
  Doc: typo fixed in qlibraryinfo.cpp