[python-httplib2/el5: 2/3] Merge branch 'el6' into el5

[Ding-Yi Chen]

commit d1be80c940e9f185f8635c99455240a38df32e0f
Merge: a3b4712 5c28c21
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri May 4 12:46:01 2012 +1000

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore

 python-httplib2.certfile.patch    |   16 ++++++++++++
 python-httplib2.getCertHost.patch |   21 ++++++++++++++++
 python-httplib2.spec              |   48 ++++++++++++++++++++++++++++++++----
 sources                           |    2 +-
 4 files changed, 80 insertions(+), 7 deletions(-)
---