Merge "Make scaling out a feature for merge.py."
authorJenkins <jenkins@review.openstack.org>
Thu, 30 Jan 2014 02:43:53 +0000 (02:43 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 30 Jan 2014 02:43:53 +0000 (02:43 +0000)

Trivial merge