[cobbler/el5/master: 105/105] Merge from master

[Scott Henson]

commit 6774d6511aca08ce374ff7014d9556797987de23
Merge: e44c3e5 5729e77
Author: Scott Henson <shenson at redhat.com>
Date:   Mon Oct 18 11:45:00 2010 -0400

    Merge from master

 .gitignore   |    1 +
 cobbler.spec |   27 ++++++++++++++++++++++++---
 sources      |    1 +
 3 files changed, 26 insertions(+), 3 deletions(-)
---
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