#21671 CVE-2014-0224 Update openssl to 1.0.1h
Merge branch 'master' of github.com:tjguk/python-dev
Merge branch 'master' of github.com:tjguk/python-dev

Conflicts:
	configure.3.4.ini
	configure.default.ini