[python-zope-component/el6: 1/2] Merge branch 'master' into el6

[Ralph Bean]

commit 74d662409c8370ef3bc6526c0c6880ca16e9444a
Merge: f5be1ac 417a6f7
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Dec 3 09:53:57 2012 -0500

    Merge branch 'master' into el6

 .gitignore                 |    1 +
 python-zope-component.spec |   60 ++++++++++++++++++++++++++++++++++++++++++-
 sources                    |    2 +-
 3 files changed, 60 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index f3f52f1,04db31b..6b3b7d4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/zope.component-3.9.5.tar.gz
  /zope.component-3.10.0.tar.gz
+ /zope.component-4.0.1.tar.gz