[cobbler/f16] New upstream release - 2.4.0-beta2

[jimi]

commit 1dafdfa2a31bc20ac9e2ca522ac8f8c76e8a67af
Author: James Cammarata <jimi at sngx.net>
Date:   Thu Oct 11 18:21:05 2012 -0500

    New upstream release - 2.4.0-beta2

 .gitignore   |    1 +
 cobbler.spec |    6 +++++-
 sources      |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 298e0ab..8730655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ cobbler-2.0.5.tar.gz
 /cobbler-2.2.1.tar.gz
 /cobbler-2.2.2.tar.gz
 /cobbler-2.2.3.tar.gz
+/cobbler-2.4.0.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 063f06d..118ed61 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -8,7 +8,7 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.4.0
-Release: beta1%{?dist}
+Release: beta2%{?dist}
 Source0: http://shenson.fedorapeople.org/cobbler/cobbler-%{version}.tar.gz
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -334,6 +334,10 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 /var/www/cobbler_webui_content/
 
 %changelog
+* Thu Oct 11 2012 James Cammarata <jimi at sngx.net> 2.4.0-beta2
+- Modified spec version/release to be 2.4.0-beta2 (jimi at sngx.net)
+- fixing up a bad commit merge (jimi at sngx.net)
+
 * Thu Oct 11 2012 James Cammarata <jimi at sngx.net> 2.4.0-beta1
 - Beta Release 1 of 2.4.0
 - BUGFIX - Issue #329 - Systems no longer allow an add with an image for a
diff --git a/sources b/sources
index 90c4a96..fa172e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f51cf4d51f97cf44c03fa9de6ff75baf  cobbler-2.2.3.tar.gz
+1fc2057940d58d44eea3abd6fd1d6d4b  cobbler-2.4.0.tar.gz