Merge commit 'refs/changes/97/66597/4' of git://gold.eng.hq.xensource.com/git/github/openstack/nova into tmpbranch
Merge commit 'refs/changes/79/69879/3' of git://gold.eng.hq.xensource.com/git/github/openstack/nova into tmpbranch