[bcfg2/el6/master: 24/24] Merge remote branch 'origin/master' into el6

Wed Sep 29 18:34:14 UTC 2010

commit 6f62a4dfddab9e6cf14c1c4b3c87fef831cc545a
Merge: fb59038 8641bbe
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Sep 29 13:34:01 2010 -0500

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                    |    9 ++-
 bcfg2-0.9.5pre4-tgenshi.patch |   59 -----------
 bcfg2-serverinitsubsys.patch  |   20 ----
 bcfg2.spec                    |  219 +++++++++++++++++++++++++++++++++++++---
 branch                        |    2 +-
 sources                       |    3 +-
 6 files changed, 213 insertions(+), 99 deletions(-)
---