[MERGE][1.9][bug 293054] Build the ssl socket in a python-2.6 compatible way *and* make the test suite passes again on OSX with python-2.6

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Cm2wsfg6g6s.fsf%40free.fr%3E
Project: Bazaar