commit b2adae304abc66156a5f46186b93e2271fc18509 Merge: d1be80c 87097fb Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Fri May 4 12:46:39 2012 +1000 Merge branch 'el5' of ssh://pkgs.fedoraproject.org/python-httplib2 into el5 ---