Merge branch 'dev_branch_0.8' of gitorious.org:qa-tools/ots into dev_branch_0.8
authortgalvin <tom@sarasola.co.uk>
Wed, 8 Dec 2010 19:52:19 +0000 (19:52 +0000)
committertgalvin <tom@sarasola.co.uk>
Wed, 8 Dec 2010 19:52:19 +0000 (19:52 +0000)
commite8970f2eaf2b92ec104f0194c7f78296aecf3c64
treef5e28b0f9c7716763bb95bccdcc3338883987928
parentc5e30a29a14eb3330b72bcc156bbaee5f8c216c4
parent2913cd8408fa4d01a4b8dee04f2e9d50f8557d84
Merge branch 'dev_branch_0.8' of gitorious.org:qa-tools/ots into dev_branch_0.8