Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 26 Jul 2011 23:34:47 +0000 (09:34 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 26 Jul 2011 23:34:47 +0000 (09:34 +1000)
commitc9f0c578bbaf73211ad4729e1496e53867a641c9
treeb73534ee0487e485d4336907465550688f5b2ad1
parentaa19362a14ce20bde2ada61edf7b946019845ed2
parent2c60a4f67f9fb02f3b711fe749b2f293a07b4e02
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Make it possible to update a related table after an external update