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

[Ding-Yi Chen]

commit f9745ec3cd1ef4b3ec0b6c8868a70907d11c86c5
Merge: b2339e6 c70a197
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 30 11:55:14 2012 +1000

    Merge branch 'master' into el5

 python-httplib2.rfc2459.patch |   19 +++++++++++++++++++
 python-httplib2.spec          |   11 ++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---