Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Jan 2011 03:14:36 +0000 (13:14 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 12 Jan 2011 03:14:36 +0000 (13:14 +1000)
commita9bf77fd378d8a8820beb7319eb4b74ae62d4560
tree203b9a1f87801119568831df73137bbfd344f3d7
parentefdd9e8949bb6cb88a087f02f81d6d8ef18a08d1
parentfbc2c44d1382e223a9a6e13fab66731fc6d54b18
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update copyright year to 2011.