Merge branch 'conductor_cmds_regr' into dev_branch_0.8
authortgalvin <tom@sarasola.co.uk>
Tue, 7 Dec 2010 09:51:44 +0000 (09:51 +0000)
committertgalvin <tom@sarasola.co.uk>
Tue, 7 Dec 2010 09:51:44 +0000 (09:51 +0000)
commita1db78dcef2cbf4f9b110d7a71fb1571e0ef6bc8
tree349a8309123773b0768053fbefd79a2c19c86d79
parent9c0b04787fb1494db0a43613116f8b7f0d2c4430
parent243ce0202b87881122d4c9ba4db91617f3c8329c
Merge branch 'conductor_cmds_regr' into dev_branch_0.8