Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
authoraavit <qt-info@nokia.com>
Tue, 18 Jan 2011 11:44:56 +0000 (12:44 +0100)
committeraavit <qt-info@nokia.com>
Tue, 18 Jan 2011 11:44:56 +0000 (12:44 +0100)
commitbef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81
treea44006d06de4c7aea7e1ea792261f001ebd8d373
parentce089742eb9caed768beed0ae68b2623a9cdf2ca
parent46ba213883cf46871ef539ef4d2304064b671175
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2