Index: branches/fc13-dev/server/fedora/config/etc/hosts
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/hosts	(revision 1673)
+++ branches/fc13-dev/server/fedora/config/etc/hosts	(revision 1674)
@@ -10,18 +10,16 @@
 18.181.0.229	scripts-test.mit.edu scripts-test
 
+18.181.0.53	old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
 18.181.0.57	better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
-18.181.0.53	old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
 18.181.0.167	bees-knees.mit.edu bees-knees sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3
 18.181.0.228	cats-whiskers.mit.edu cats-whiskers scripts4.mit.edu scripts4
-18.181.0.236	whole-enchilada.mit.edu whole-enchilada scripts5.mit.edu scripts5
 18.181.0.237	pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
 18.181.0.234	busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
 18.181.0.235	real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
 
+172.21.0.53	old-faithful.mit.edu
 172.21.0.57	better-mousetrap.mit.edu
-172.21.0.53	old-faithful.mit.edu
 172.21.0.167	bees-knees.mit.edu
 172.21.0.228	cats-whiskers.mit.edu
-172.21.0.236	whole-enchilada.mit.edu
 172.21.0.237	pancake-bunny.mit.edu
 172.21.0.234	busy-beaver.mit.edu
Index: branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real	(revision 1673)
+++ branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real	(revision 1674)
@@ -6,7 +6,4 @@
 use Net::LDAP;
 use strict;
-
-my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
-my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
 
 # Nagios codes
@@ -28,5 +25,5 @@
 my $replicaErrors = 0;
 my $conflictErrors = 0;
-my $errorstring = "Replication error(s): $nl";
+my $errorstring = "Replication error(s): ";
 foreach my $entr ( @entries ) {
     my $servername=$entr->get_value($server);
@@ -38,6 +35,6 @@
     $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
     $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
-    print "Replication to $servername last operation $serverlaststart $nl";
-    print $tab . "Status: $serverstatus.     $nl";
+    print "Replication to $servername last operation $serverlaststart ";
+    print "Status: $serverstatus.     ";
     if ($statuscode) {
         $replicaErrors++;
@@ -45,5 +42,4 @@
     }
 }
-print "$nl";
 
 $result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
@@ -52,10 +48,9 @@
     my $conflictingDN=$entr->dn();
     my $conflictDesc=$entr->get_value("nsds5ReplConflict");
-    print "Conflict found for DN $conflictingDN $nl";
-    print $tab . "Reason: $conflictDesc.     $nl";
+    print "Conflict found for DN $conflictingDN ";
+    print "Reason: $conflictDesc.     ";
     $conflictErrors++;
     $errorstring = $errorstring . $conflictDesc . ", ";
 }
-print "$nl";
 
 if ($conflictErrors > 0) {
Index: branches/fc13-dev/server/fedora/config/etc/sudoers
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/sudoers	(revision 1673)
+++ branches/fc13-dev/server/fedora/config/etc/sudoers	(revision 1674)
@@ -56,5 +56,4 @@
 Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
 Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
-Defaults    env_keep += "USE_NEWLINES"
 
 ## Next comes the main part: which users can run what software on 
Index: branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1	(revision 1673)
+++ branches/fc13-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1	(revision 1674)
@@ -2,10 +2,9 @@
 18.181.0.56 via 172.21.0.56
 18.181.0.52 via 172.21.0.52
+18.181.0.53 via 172.21.0.53
 18.181.0.57 via 172.21.0.57
-18.181.0.53 via 172.21.0.53
 18.181.0.167 via 172.21.0.167
 18.181.0.228 via 172.21.0.228
-18.181.0.236 via 172.21.0.236
-18.181.0.237 via 172.21.0.237
 18.181.0.234 via 172.21.0.234
 18.181.0.235 via 172.21.0.235
+18.181.0.237 via 172.21.0.237
Index: branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 1673)
+++ branches/fc13-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 1674)
@@ -101,5 +101,4 @@
 	} elsif ($message =~ m|^Postponed keyboard-interactive|) {
 	} elsif ($message =~ m|^Failed keyboard-interactive/pam|) {
-	} elsif ($message =~ m|^Did not receive identification string from|) {
 	} elsif ($message =~ m|^fatal: Read from socket failed: Connection reset by peer$|) {
 	} elsif ($message =~ m|^reverse mapping checking getaddrinfo|) {