Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authoraavit <qt-info@nokia.com>
Wed, 1 Dec 2010 08:21:03 +0000 (09:21 +0100)
committeraavit <qt-info@nokia.com>
Wed, 1 Dec 2010 08:21:03 +0000 (09:21 +0100)
commit0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc
tree2cb7ed8e38523641a8a88a0d4c1f42014cae10af
parentde30288bb108d70cd66774c3beb7497efb5d0e6d
parentd6174e48b4835d6fdaf10d9b742b866f03cbdcef
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7