[python-pycurl/f12/master: 6/6] Merge branch 'master' into f12

[Jeffrey C. Ollie]

commit bf828c4f83e6e11f991b64ebd056951ea2a9d202
Merge: 4ebeede ac3344c
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Aug 17 13:54:44 2010 -0500

    Merge branch 'master' into f12

 python-pycurl-fix-do_curl_reset-refcount.patch |   24 ++++++++++++++++++++++++
 python-pycurl.spec                             |   19 +++++++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)
---