Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
authoraavit <qt_aavit@ovi.com>
Fri, 2 Dec 2011 12:52:17 +0000 (13:52 +0100)
committeraavit <qt_aavit@ovi.com>
Fri, 2 Dec 2011 12:52:17 +0000 (13:52 +0100)
commit8762666d8b6854089ea35bb61ced690cdd59791c
tree4459aaebd84de23db6fc53d0ff6d3c5edacc8c5b
parent46db88be9fb0b8951916d706c39e1079f38f277d
parentbc25cfdd65452efa226cbd544c9ae9803eb6748a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team