Merge commit 'refs/changes/81/68181/1' of git://gold.eng.hq.xensource.com/git/github/openstack/requirements into tmpbranch