[mod_python/el6/master: 6/6] Merge branch 'master' into el6

[Lubomir Rintel]

commit c9172c6e37792630117db4b723565180070bb752
Merge: 43f0d1d e4d680c
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Nov 30 06:25:37 2010 -0500

    Merge branch 'master' into el6

 mod_python-3.3.1-pycapsule.patch |   57 ++++++++++++++++++++++++++++++++++++++
 mod_python.spec                  |   42 ++++++++++++++++++---------
 2 files changed, 85 insertions(+), 14 deletions(-)
---