Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Oct 2011 12:48:34 +0000 (22:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Oct 2011 12:48:34 +0000 (22:48 +1000)
commit109ece623d8a973a2d97263309aa32bceab7e210
tree926544285467232917bf31a752e85787e20f32db
parentf2526089d4b84b0b2c8a511ff2c22a22a6f2ee73
parent3b51392d6ab6cc3a1760ca2c795261e185bd344a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Ukrainian translation updated