[python-cement/el6: 5/6] Merge branches 'HEAD' and 'master' into el6

[derks]

commit febd6b98d4b720ad0341a79498eea787428f83bc
Merge: cc0219e 76937c2
Author: BJ Dierkes <wdierkes at rackspace.com>
Date:   Tue Jul 12 18:58:18 2011 -0500

    Merge branches 'HEAD' and 'master' into el6

 .gitignore                     |    1 +
 cement-0.8.18-paths.patch      |   33 ++++++++++++++++++++++++++++
 cement-0.8.18-setuptools.patch |   47 ++++++++++++++++++++++++++++++++++++++++
 cement-tests.patch             |   18 ---------------
 python-cement.spec             |   36 ++++++++++++++++++++++--------
 sources                        |    2 +-
 6 files changed, 108 insertions(+), 29 deletions(-)
---