Merge branch 'f14' into el6

Conflicts:
	.gitignore
	sources
	torque.spec

.gitignore

@@ -1 +1,3 @@
-torque-2.4.10.tar.gz
+torque-2.4.8.tar.gz
+/torque-2.4.10.tar.gz
+/torque-2.4.11.tar.gz

sources

@@ -1 +1 @@
-02d9dd08d89d937d047a999b5d31f8a1  torque-2.4.10.tar.gz
+797eb4a80b75fb76ec99c75efd76e781  torque-2.4.11.tar.gz

torque.spec

@@ -67,7 +67,7 @@
 %global server_nameflags --with-default-server=%{server_name}
 
 Name:        torque
-Version:     2.4.10
+Version:     2.4.11
 Release:     1%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -645,9 +645,12 @@ fi
 
 
 %changelog
+* Thu Nov 18 2010 Steve Traylen <steve.traylen@cern.ch> - 2.4.11-1
+- New upstream 2.4.11.
+
 * Tue Sep 7 2010 Steve Traylen <steve.traylen@cern.ch> - 2.4.10-1
-- New version for 2.4.10-1.
-- Three new man pages.
+- New upstream 2.4.10.
+- Add 3 new man pages to file listing.
 
 * Wed Jul 14 2010 Steve Traylen <steve.traylen@cern.ch> - 2.4.8-3
 - Rebuild for cvs mistake.