Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 3 Apr 2010 15:51:20 +0000 (17:51 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 3 Apr 2010 15:51:20 +0000 (17:51 +0200)
commitd6c9b45f5979d6b99b1078db38d6ae402fb4332c
tree08848e52e49acf706498a1c5031c44eb23f4998f
parent98ce026af9e1fcdc9ae68a2757d102c9093c023c
parent7f6fe4bc968763d50c4b1d61017f9a45927250e9
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  [plugins] Don't conclude that a .debug file is a plugin.