Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 3 Nov 2010 18:24:36 +0000 (19:24 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 3 Nov 2010 18:24:36 +0000 (19:24 +0100)
commit852cefcbcc92006dcb18c846f4e2f2dfe5b56410
treed9d2e5c2095155c6dcf00cf01ecb1276f68a39b3
parentd8416650ae9d345f289bd697461891dede7c410c
parentdeb2ace2a31ae9881ef335f0f6c4f523879f01f9
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7