s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/curl/interface.c
Merge branch 'PHP-5.5'