Merge branch 'dev_conductor' into dev_branch_0.1
authorTeemu Vainio <ext-teemu.a.vainio@nokia.com>
Thu, 23 Sep 2010 13:00:41 +0000 (16:00 +0300)
committerTeemu Vainio <ext-teemu.a.vainio@nokia.com>
Thu, 23 Sep 2010 13:00:41 +0000 (16:00 +0300)
commit0711ba8248ed63a4fc1c2873ebcc8b264a32a4f1
tree6a5f816843d9d009c37a1b5874f42bdbf55c07dc
parenta889b75f41bb80e83ccfbb9da3e40ba08b2667b4
parent427680ebeaee7f74879c5f79c9ed32cbdadeb14c
Merge branch 'dev_conductor' into dev_branch_0.1
ots.worker/setup.py