Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Mar 2010 00:54:50 +0000 (01:54 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Mar 2010 00:54:50 +0000 (01:54 +0100)
commit2aaad2476345e0c44da488ed33c71b8f378a582c
tree7546619c4d6b128bb6cd6c89bc323bf4ca29b74a
parent2dd38c17741536c85ed24536addcee8a7b12fe50
parent9ca30bd3ab50c48d0cddfa7265a3514d288845f4
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix another off-by-1 error in OpenVG image painting.