[python-cement/el5/master: 2/2] Merge branches 'HEAD' and 'master' into el5

[derks]

commit a264b3dbdfbe03137d18bbf489a9cdcb26c76c6f
Merge: f0a92b0 e90632b
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Mon Feb 7 15:10:31 2011 -0600

    Merge branches 'HEAD' and 'master' into el5

 .gitignore         |    1 +
 python-cement.spec |   22 +++++++++++++++++++---
 sources            |    2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)
---