[cobbler/el6/master: 18/18] Merge from master

[Scott Henson]

commit 27007b9864c935ac1c66e666e9398e34e514c994
Merge: e190e26 5729e77
Author: Scott Henson <shenson at redhat.com>
Date:   Mon Oct 18 11:40:46 2010 -0400

    Merge from master

 .gitignore   |    1 +
 cobbler.spec |   29 +++++++++++++++++++++++++----
 sources      |    1 +
 3 files changed, 27 insertions(+), 4 deletions(-)
---
diff --cc cobbler.spec
index 979fe24,1e35bf5..56d0815
--- a/cobbler.spec
+++ b/cobbler.spec
@@@ -379,9 -397,9 +397,12 @@@ Web interface for Cobbler that allows v
  %doc AUTHORS COPYING CHANGELOG README
  
  %changelog
+ * Wed Oct 18 2010 Scott Henson <shenson at redhat.com> - 2.0.7-1
+ - Bug fix relase, see Changelog for details
+ 
 +* Thu Jul 15 2010 Scott Henson <shenson at redhat.com> - 2.0.5-2
 +- Build fix for el6
 +
  * Tue Jul 13 2010 Scott Henson <shenson at redhat.com> - 2.0.5-1
  - Bug fix release, see Changelog for details
  
diff --cc sources
index dc04bc9,4e3ccc9..da088a3
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,3 @@@
 +b08b2b6a4fac2affb61c9760a152558b  cobbler-2.0.4.tar.gz
 +ced1c9b9dcbddad647e501ead02c64f0  cobbler-2.0.5.tar.gz
+ a4e05e5a8b9d69235502c8b6f0065aee  cobbler-2.0.7.tar.gz