Merge commit 'refs/changes/27/93827/4' of git://gold.eng.hq.xensource.com/git/github/openstack/nova into tmpbranch