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 13:50:30 +0000 (14:50 +0100)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>
Thu, 4 Nov 2010 13:50:30 +0000 (14:50 +0100)
commit05039d6759e00767fcbb135100824e7fad1b07b2
tree477762022d7e4f524857b36ec053b2db98a6d27b
parent81fd236d0fa4d66ac288c450c7993acec110b8f6
parent990a19f9e19b84a896f55ea580e6db4edbca2573
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7