[python-httplib2/el5: 12/12] Merge branch 'master' into el5

[Ding-Yi Chen]

commit b2339e6d4a877772af12cfced216a955f2b40c18
Merge: b2adae3 cfe1853
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Jun 22 17:15:55 2012 +1000

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore                        |    2 +
 python-httplib2.getCertHost.patch |   12 +++---
 python-httplib2.spec              |   70 +++++++++++++++++++++++++++++++++---
 3 files changed, 72 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 791f633,b8d3816..a3de500
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,3 @@@
  httplib2-0.4.0.tar.gz
+ /httplib2-0.7.2.tar.gz
+ /httplib2-0.7.4.tar.gz
 -