Merge branch 'dev_branch_0.1' of gitorious.org:/qa-tools/ots into dev_conductor_timeout
authorTuomo Makinen <ext-tuomo.jo.makinen@nokia.com>
Mon, 8 Nov 2010 14:13:18 +0000 (16:13 +0200)
committerTuomo Makinen <ext-tuomo.jo.makinen@nokia.com>
Mon, 8 Nov 2010 14:13:18 +0000 (16:13 +0200)
commit4d854e47485d254cfe1c8bd330e933dcd18f23c6
treec638d5444a1778fff554843c8729d29bcad6f0ad
parent3a76d23ee10dff9432c0546e684bde9b09ad694d
parentff05232f65eae08c943e51ba56d732d58ca5597c
Merge branch 'dev_branch_0.1' of gitorious.org:/qa-tools/ots into dev_conductor_timeout