Merge commit 'refs/changes/97/61397/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/22/61422/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch