tree 9f198b8ab47e321e515fd0d3b490809bfc4ad9ff
parent e7ce24fc96eed61d34a10b6bb2e8bc86c7e7755a
parent 6f98f223bbb748d2838b11f0c8c86c87cb8e64a1
author James E. Blair <james.blair@rackspace.com> 1320959171 -0800
committer James E. Blair <james.blair@rackspace.com> 1320959171 -0800

Merge branch 'master' of https://github.com/cloudbuilders/devstack into test