Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>
Thu, 4 Nov 2010 09:33:23 +0000 (10:33 +0100)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>
Thu, 4 Nov 2010 09:33:23 +0000 (10:33 +0100)
commit5549cd45e319e3019e2aac64a2143977f860e883
tree288ac8f55fb634d81ee62c8eddc08929971d02e0
parentfa4ee0aadd00c976a70ef63aeb5be1d4eb52f928
parent4b0ced38a3e52836a8122bee95fa9056818e1206
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7