Merge remote branch 'origin/4.6' into 4.7-from-4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Sat, 17 Jul 2010 23:32:27 +0000 (09:32 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Sat, 17 Jul 2010 23:32:27 +0000 (09:32 +1000)
commit15efa03d234aa51b0c24c68c18a98dce0d66bdff
tree19116918f6aa138197831c2cb86e1adcce120dea
parent8d545a21b6aa89675b404a9d7bf08b7499d26e5e
parentb86eac6486c77121cfae897427317885fe339d40
Merge remote branch 'origin/4.6' into 4.7-from-4.6

Conflicts:
tests/auto/network.pro
tests/auto/network.pro