merge 2.7.9 release branch

diff --cc Lib/httplib.py
Simple merge

diff --cc Lib/test/test_httplib.py
Simple merge

diff --cc Misc/NEWS
Simple merge