[bcfg2: 4/6] Merge branch 'master' into f12/dmacc

[Jeffrey C. Ollie]

commit a8ef68526fa6ea9cc56549aa01c5eb078a870671
Merge: 5294ac2 d015eb6
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Aug 31 09:17:35 2010 -0500

    Merge branch 'master' into f12/dmacc
    
    Conflicts:
    	.gitignore

 .gitignore                    |    2 +-
 bcfg2-0.9.5pre4-tgenshi.patch |   59 --------------------
 bcfg2-serverinitsubsys.patch  |   20 -------
 bcfg2.spec                    |  118 +++++++++++++++++++++++++++++++++++------
 sources                       |    4 +-
 5 files changed, 105 insertions(+), 98 deletions(-)
---
diff --cc .gitignore
index ac53196,92e4f9d..46ed9d8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- bcfg2-0.9.6.tar.gz
+ bcfg2-1.1.0rc4.tar.gz
 -bcfg2-1.1.0rc4.tar.gz.gpg
 -tgenshi-indent.patch