Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Fri, 1 Oct 2010 17:53:25 +0000 (19:53 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Fri, 1 Oct 2010 17:53:25 +0000 (19:53 +0200)
commit4cdaadb332a49513d6082b6ea723dc1968b3ad30
treefbcbf013e29ad3e4c718dca5ca2dc25d2f9498ff
parent7799c68a964dd9a26cc98fa4b810fce7cc333e27
parent5d95b43762a16a37a20b3288c74976f6e62075d3
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7