Merge commit 'refs/changes/41/127941/3' of git://gold.eng.hq.xensource.com/git/github/openstack/nova into tmpbranch