Merge branch 'dev_branch_0.1' of gitorious.org:/qa-tools/ots into dev_conductor_timeout
authorTuomo Makinen <ext-tuomo.jo.makinen@nokia.com>
Fri, 5 Nov 2010 13:55:11 +0000 (15:55 +0200)
committerTuomo Makinen <ext-tuomo.jo.makinen@nokia.com>
Fri, 5 Nov 2010 13:55:11 +0000 (15:55 +0200)
commit4c628c207a83f37c6d02434bf8cc1ec486588d2e
tree966eb3ea885b9a80515743e5193de55bae2e244b
parentbe9e4533878bfd7d6c0403b417a6f745d9d92c08
parent36c7b509daef77e38fb215af49d36ab5f22aab53
Merge branch 'dev_branch_0.1' of gitorious.org:/qa-tools/ots into dev_conductor_timeout

Conflicts:
ots.server/ots/server/conductorengine/tests.py
ots.server/ots/server/conductorengine/tests.py