diff -rupN xorp-1.6.orig/bgp/aspath.cc xorp-1.6/bgp/aspath.cc
--- xorp-1.6.orig/bgp/aspath.cc	2009-01-05 13:30:42.000000000 -0500
+++ xorp-1.6/bgp/aspath.cc	2011-02-26 14:58:04.751960544 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/aspath.cc,v 1.45 2009/01/05 18:30:42 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/aspath_test.cc xorp-1.6/bgp/aspath_test.cc
--- xorp-1.6.orig/bgp/aspath_test.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/aspath_test.cc	2011-02-26 14:58:04.856075102 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/aspath_test.cc,v 1.22 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/attribute_manager.cc xorp-1.6/bgp/attribute_manager.cc
--- xorp-1.6.orig/bgp/attribute_manager.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/attribute_manager.cc	2011-02-26 14:58:04.911930377 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/attribute_manager.cc,v 1.20 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 #include "bgp_module.h"
diff -rupN xorp-1.6.orig/bgp/bgp.cc xorp-1.6/bgp/bgp.cc
--- xorp-1.6.orig/bgp/bgp.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/bgp.cc	2011-02-26 14:58:04.864035674 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/bgp.cc,v 1.96 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_MAXIMUM_DELAY
 // #define DEBUG_LOGGING
diff -rupN xorp-1.6.orig/bgp/bgp_trie.cc xorp-1.6/bgp/bgp_trie.cc
--- xorp-1.6.orig/bgp/bgp_trie.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/bgp_trie.cc	2011-02-26 14:58:04.695875958 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/bgp_trie.cc,v 1.27 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/bgp/bgp_varrw.cc xorp-1.6/bgp/bgp_varrw.cc
--- xorp-1.6.orig/bgp/bgp_varrw.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/bgp_varrw.cc	2011-02-26 14:58:04.671931129 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/bgp_varrw.cc,v 1.40 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/bgp/bgp_varrw_export.cc xorp-1.6/bgp/bgp_varrw_export.cc
--- xorp-1.6.orig/bgp/bgp_varrw_export.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/bgp_varrw_export.cc	2011-02-26 14:58:04.760274244 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/bgp_varrw_export.cc,v 1.12 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/crash_dump.cc xorp-1.6/bgp/crash_dump.cc
--- xorp-1.6.orig/bgp/crash_dump.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/crash_dump.cc	2011-02-26 14:58:04.656589501 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/crash_dump.cc,v 1.9 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/bgp/damping.cc xorp-1.6/bgp/damping.cc
--- xorp-1.6.orig/bgp/damping.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/damping.cc	2011-02-26 14:58:04.779954257 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/damping.cc,v 1.12 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/dummy_main.cc xorp-1.6/bgp/dummy_main.cc
--- xorp-1.6.orig/bgp/dummy_main.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/dummy_main.cc	2011-02-26 14:58:04.776177052 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/dummy_main.cc,v 1.26 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/dummy_next_hop_resolver.cc xorp-1.6/bgp/dummy_next_hop_resolver.cc
--- xorp-1.6.orig/bgp/dummy_next_hop_resolver.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/dummy_next_hop_resolver.cc	2011-02-26 14:58:04.787879181 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/dummy_next_hop_resolver.cc,v 1.20 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/dump_iterators.cc xorp-1.6/bgp/dump_iterators.cc
--- xorp-1.6.orig/bgp/dump_iterators.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/dump_iterators.cc	2011-02-26 14:58:04.840109614 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/dump_iterators.cc,v 1.37 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/harness/bgppp.cc xorp-1.6/bgp/harness/bgppp.cc
--- xorp-1.6.orig/bgp/harness/bgppp.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/bgppp.cc	2011-02-26 14:58:04.728442226 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/bgppp.cc,v 1.20 2009/01/05 18:30:45 jtc Exp $"
 
 /*
 ** BGP Pretty Print
diff -rupN xorp-1.6.orig/bgp/harness/command.cc xorp-1.6/bgp/harness/command.cc
--- xorp-1.6.orig/bgp/harness/command.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/command.cc	2011-02-26 14:58:04.708265549 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/command.cc,v 1.29 2009/01/05 18:30:45 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/harness/coord.cc xorp-1.6/bgp/harness/coord.cc
--- xorp-1.6.orig/bgp/harness/coord.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/coord.cc	2011-02-26 14:58:04.719860917 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/coord.cc,v 1.33 2009/01/05 18:30:45 jtc Exp $"
 
 #include "bgp/bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/harness/peer.cc xorp-1.6/bgp/harness/peer.cc
--- xorp-1.6.orig/bgp/harness/peer.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/peer.cc	2011-02-26 14:58:04.715984549 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/peer.cc,v 1.91 2009/01/05 18:30:45 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/harness/test_peer.cc xorp-1.6/bgp/harness/test_peer.cc
--- xorp-1.6.orig/bgp/harness/test_peer.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/test_peer.cc	2011-02-26 14:58:04.724087649 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/test_peer.cc,v 1.56 2009/01/05 18:30:45 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/harness/test_trie.cc xorp-1.6/bgp/harness/test_trie.cc
--- xorp-1.6.orig/bgp/harness/test_trie.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/test_trie.cc	2011-02-26 14:58:04.732003063 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/test_trie.cc,v 1.32 2009/01/05 18:30:45 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/harness/trie.cc xorp-1.6/bgp/harness/trie.cc
--- xorp-1.6.orig/bgp/harness/trie.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/harness/trie.cc	2011-02-26 14:58:04.732003063 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/harness/trie.cc,v 1.26 2009/01/05 18:30:45 jtc Exp $"
 
 // #define DEBUG_LOGGING 
 // #define DEBUG_PRINT_FUNCTION_NAME 
diff -rupN xorp-1.6.orig/bgp/internal_message.cc xorp-1.6/bgp/internal_message.cc
--- xorp-1.6.orig/bgp/internal_message.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/internal_message.cc	2011-02-26 14:58:04.659979111 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/internal_message.cc,v 1.18 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/iptuple.cc xorp-1.6/bgp/iptuple.cc
--- xorp-1.6.orig/bgp/iptuple.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/iptuple.cc	2011-02-26 14:58:04.808291855 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/iptuple.cc,v 1.26 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING 
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/local_data.cc xorp-1.6/bgp/local_data.cc
--- xorp-1.6.orig/bgp/local_data.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/local_data.cc	2011-02-26 14:58:04.639917981 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/local_data.cc,v 1.18 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/main.cc xorp-1.6/bgp/main.cc
--- xorp-1.6.orig/bgp/main.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/main.cc	2011-02-26 14:58:04.703841780 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/main.cc,v 1.52 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/next_hop_resolver.cc xorp-1.6/bgp/next_hop_resolver.cc
--- xorp-1.6.orig/bgp/next_hop_resolver.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/next_hop_resolver.cc	2011-02-26 14:58:04.692682020 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/next_hop_resolver.cc,v 1.54 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/notification_packet.cc xorp-1.6/bgp/notification_packet.cc
--- xorp-1.6.orig/bgp/notification_packet.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/notification_packet.cc	2011-02-26 14:58:04.659979111 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/notification_packet.cc,v 1.37 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/open_packet.cc xorp-1.6/bgp/open_packet.cc
--- xorp-1.6.orig/bgp/open_packet.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/open_packet.cc	2011-02-26 14:58:04.896220259 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/open_packet.cc,v 1.34 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/packet.cc xorp-1.6/bgp/packet.cc
--- xorp-1.6.orig/bgp/packet.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/packet.cc	2011-02-26 14:58:04.763938335 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/packet.cc,v 1.20 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/parameter.cc xorp-1.6/bgp/parameter.cc
--- xorp-1.6.orig/bgp/parameter.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/parameter.cc	2011-02-26 14:58:04.616331843 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/parameter.cc,v 1.39 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/path_attribute.cc xorp-1.6/bgp/path_attribute.cc
--- xorp-1.6.orig/bgp/path_attribute.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/path_attribute.cc	2011-02-26 14:58:04.803936663 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/path_attribute.cc,v 1.101 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/peer.cc xorp-1.6/bgp/peer.cc
--- xorp-1.6.orig/bgp/peer.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/peer.cc	2011-02-26 14:58:04.679863059 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/peer.cc,v 1.151 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/peer_data.cc xorp-1.6/bgp/peer_data.cc
--- xorp-1.6.orig/bgp/peer_data.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/peer_data.cc	2011-02-26 14:58:04.776177052 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/peer_data.cc,v 1.38 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/peer_handler.cc xorp-1.6/bgp/peer_handler.cc
--- xorp-1.6.orig/bgp/peer_handler.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/peer_handler.cc	2011-02-26 14:58:04.815937306 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/peer_handler.cc,v 1.52 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/peer_handler_debug.cc xorp-1.6/bgp/peer_handler_debug.cc
--- xorp-1.6.orig/bgp/peer_handler_debug.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/peer_handler_debug.cc	2011-02-26 14:58:04.791915100 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/peer_handler_debug.cc,v 1.18 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 #include "bgp_module.h"
diff -rupN xorp-1.6.orig/bgp/peer_list.cc xorp-1.6/bgp/peer_list.cc
--- xorp-1.6.orig/bgp/peer_list.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/peer_list.cc	2011-02-26 14:58:04.900439239 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/peer_list.cc,v 1.30 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/plumbing.cc xorp-1.6/bgp/plumbing.cc
--- xorp-1.6.orig/bgp/plumbing.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/plumbing.cc	2011-02-26 14:58:04.703841780 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/plumbing.cc,v 1.112 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/process_watch.cc xorp-1.6/bgp/process_watch.cc
--- xorp-1.6.orig/bgp/process_watch.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/process_watch.cc	2011-02-26 14:58:04.832427811 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/process_watch.cc,v 1.20 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/profile_vars.cc xorp-1.6/bgp/profile_vars.cc
--- xorp-1.6.orig/bgp/profile_vars.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/profile_vars.cc	2011-02-26 14:58:04.652305488 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/profile_vars.cc,v 1.22 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/rib_ipc_handler.cc xorp-1.6/bgp/rib_ipc_handler.cc
--- xorp-1.6.orig/bgp/rib_ipc_handler.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/rib_ipc_handler.cc	2011-02-26 14:58:04.911930377 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/rib_ipc_handler.cc,v 1.81 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_queue.cc xorp-1.6/bgp/route_queue.cc
--- xorp-1.6.orig/bgp/route_queue.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_queue.cc	2011-02-26 14:58:04.760274244 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_queue.cc,v 1.17 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/route_table_aggregation.cc xorp-1.6/bgp/route_table_aggregation.cc
--- xorp-1.6.orig/bgp/route_table_aggregation.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_aggregation.cc	2011-02-26 14:58:04.663855922 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_aggregation.cc,v 1.30 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_base.cc xorp-1.6/bgp/route_table_base.cc
--- xorp-1.6.orig/bgp/route_table_base.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_base.cc	2011-02-26 14:58:04.835999025 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_base.cc,v 1.16 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_cache.cc xorp-1.6/bgp/route_table_cache.cc
--- xorp-1.6.orig/bgp/route_table_cache.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_cache.cc	2011-02-26 14:58:04.652305488 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_cache.cc,v 1.45 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_damping.cc xorp-1.6/bgp/route_table_damping.cc
--- xorp-1.6.orig/bgp/route_table_damping.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_damping.cc	2011-02-26 14:58:04.851921843 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_debug.cc xorp-1.6/bgp/route_table_debug.cc
--- xorp-1.6.orig/bgp/route_table_debug.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_debug.cc	2011-02-26 14:58:04.647868207 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_debug.cc,v 1.22 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_decision.cc xorp-1.6/bgp/route_table_decision.cc
--- xorp-1.6.orig/bgp/route_table_decision.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_decision.cc	2011-02-26 14:58:04.883845329 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_decision.cc,v 1.52 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_deletion.cc xorp-1.6/bgp/route_table_deletion.cc
--- xorp-1.6.orig/bgp/route_table_deletion.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_deletion.cc	2011-02-26 14:58:04.643844801 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_deletion.cc,v 1.31 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_dump.cc xorp-1.6/bgp/route_table_dump.cc
--- xorp-1.6.orig/bgp/route_table_dump.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_dump.cc	2011-02-26 14:58:04.887860372 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_dump.cc,v 1.45 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_fanout.cc xorp-1.6/bgp/route_table_fanout.cc
--- xorp-1.6.orig/bgp/route_table_fanout.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_fanout.cc	2011-02-26 14:58:04.868485636 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_fanout.cc,v 1.67 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_filter.cc xorp-1.6/bgp/route_table_filter.cc
--- xorp-1.6.orig/bgp/route_table_filter.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_filter.cc	2011-02-26 14:58:04.828241756 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_filter.cc,v 1.58 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_nhlookup.cc xorp-1.6/bgp/route_table_nhlookup.cc
--- xorp-1.6.orig/bgp/route_table_nhlookup.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_nhlookup.cc	2011-02-26 14:58:04.699917630 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_nhlookup.cc,v 1.34 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_policy.cc xorp-1.6/bgp/route_table_policy.cc
--- xorp-1.6.orig/bgp/route_table_policy.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_policy.cc	2011-02-26 14:58:04.756099363 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_policy.cc,v 1.30 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_policy_ex.cc xorp-1.6/bgp/route_table_policy_ex.cc
--- xorp-1.6.orig/bgp/route_table_policy_ex.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_policy_ex.cc	2011-02-26 14:58:04.608680878 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_policy_ex.cc,v 1.11 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_policy_im.cc xorp-1.6/bgp/route_table_policy_im.cc
--- xorp-1.6.orig/bgp/route_table_policy_im.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_policy_im.cc	2011-02-26 14:58:04.871862896 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_policy_im.cc,v 1.22 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_policy_sm.cc xorp-1.6/bgp/route_table_policy_sm.cc
--- xorp-1.6.orig/bgp/route_table_policy_sm.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_policy_sm.cc	2011-02-26 14:58:04.619919631 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_policy_sm.cc,v 1.15 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_reader.cc xorp-1.6/bgp/route_table_reader.cc
--- xorp-1.6.orig/bgp/route_table_reader.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_reader.cc	2011-02-26 14:58:04.748708534 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_reader.cc,v 1.14 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 #include "libxorp/xlog.h"
diff -rupN xorp-1.6.orig/bgp/route_table_ribin.cc xorp-1.6/bgp/route_table_ribin.cc
--- xorp-1.6.orig/bgp/route_table_ribin.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_ribin.cc	2011-02-26 14:58:04.879915760 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_ribin.cc,v 1.55 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/route_table_ribout.cc xorp-1.6/bgp/route_table_ribout.cc
--- xorp-1.6.orig/bgp/route_table_ribout.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/route_table_ribout.cc	2011-02-26 14:58:04.783855444 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/route_table_ribout.cc,v 1.39 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/socket.cc xorp-1.6/bgp/socket.cc
--- xorp-1.6.orig/bgp/socket.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/socket.cc	2011-02-26 14:58:04.600119286 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/socket.cc,v 1.60 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING 
 // #define DEBUG_PRINT_FUNCTION_NAME 
diff -rupN xorp-1.6.orig/bgp/subnet_route.cc xorp-1.6/bgp/subnet_route.cc
--- xorp-1.6.orig/bgp/subnet_route.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/subnet_route.cc	2011-02-26 14:58:04.896220259 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/subnet_route.cc,v 1.28 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 #include "libxorp/xlog.h"
diff -rupN xorp-1.6.orig/bgp/test_cache.cc xorp-1.6/bgp/test_cache.cc
--- xorp-1.6.orig/bgp/test_cache.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_cache.cc	2011-02-26 14:58:04.623902281 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_cache.cc,v 1.39 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_decision.cc xorp-1.6/bgp/test_decision.cc
--- xorp-1.6.orig/bgp/test_decision.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_decision.cc	2011-02-26 14:58:04.819927257 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_decision.cc,v 1.48 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_deletion.cc xorp-1.6/bgp/test_deletion.cc
--- xorp-1.6.orig/bgp/test_deletion.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_deletion.cc	2011-02-26 14:58:04.767847003 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_deletion.cc,v 1.38 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_dump.cc xorp-1.6/bgp/test_dump.cc
--- xorp-1.6.orig/bgp/test_dump.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_dump.cc	2011-02-26 14:58:04.847893469 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_dump.cc,v 1.62 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_fanout.cc xorp-1.6/bgp/test_fanout.cc
--- xorp-1.6.orig/bgp/test_fanout.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_fanout.cc	2011-02-26 14:58:04.808291855 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_fanout.cc,v 1.41 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_filter.cc xorp-1.6/bgp/test_filter.cc
--- xorp-1.6.orig/bgp/test_filter.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_filter.cc	2011-02-26 14:58:04.787879181 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_filter.cc,v 1.47 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_main.cc xorp-1.6/bgp/test_main.cc
--- xorp-1.6.orig/bgp/test_main.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_main.cc	2011-02-26 14:58:04.891880497 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_main.cc,v 1.28 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_next_hop_resolver.cc xorp-1.6/bgp/test_next_hop_resolver.cc
--- xorp-1.6.orig/bgp/test_next_hop_resolver.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_next_hop_resolver.cc	2011-02-26 14:58:04.743863054 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_next_hop_resolver.cc,v 1.33 2009/01/05 18:30:43 jtc Exp $"
 
 #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/test_nhlookup.cc xorp-1.6/bgp/test_nhlookup.cc
--- xorp-1.6.orig/bgp/test_nhlookup.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_nhlookup.cc	2011-02-26 14:58:04.684157717 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_nhlookup.cc,v 1.41 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_packet.cc xorp-1.6/bgp/test_packet.cc
--- xorp-1.6.orig/bgp/test_packet.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_packet.cc	2011-02-26 14:58:04.772279601 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_packet.cc,v 1.21 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 #include "bgp_module.h"
diff -rupN xorp-1.6.orig/bgp/test_packet_coding.cc xorp-1.6/bgp/test_packet_coding.cc
--- xorp-1.6.orig/bgp/test_packet_coding.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_packet_coding.cc	2011-02-26 14:58:04.875884534 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_packet_coding.cc,v 1.25 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_peer_data.cc xorp-1.6/bgp/test_peer_data.cc
--- xorp-1.6.orig/bgp/test_peer_data.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_peer_data.cc	2011-02-26 14:58:04.603865919 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_peer_data.cc,v 1.22 2009/01/05 18:30:43 jtc Exp $"
 
 #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/test_plumbing.cc xorp-1.6/bgp/test_plumbing.cc
--- xorp-1.6.orig/bgp/test_plumbing.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_plumbing.cc	2011-02-26 14:58:04.595865693 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_plumbing.cc,v 1.29 2009/01/05 18:30:43 jtc Exp $"
 #include "bgp_module.h"
 
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/bgp/test_policy.cc xorp-1.6/bgp/test_policy.cc
--- xorp-1.6.orig/bgp/test_policy.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_policy.cc	2011-02-26 14:58:04.832427811 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_policy.cc,v 1.15 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_ribin.cc xorp-1.6/bgp/test_ribin.cc
--- xorp-1.6.orig/bgp/test_ribin.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_ribin.cc	2011-02-26 14:58:04.851921843 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_ribin.cc,v 1.44 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_ribout.cc xorp-1.6/bgp/test_ribout.cc
--- xorp-1.6.orig/bgp/test_ribout.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_ribout.cc	2011-02-26 14:58:04.679863059 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_ribout.cc,v 1.39 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/test_subnet_route.cc xorp-1.6/bgp/test_subnet_route.cc
--- xorp-1.6.orig/bgp/test_subnet_route.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/test_subnet_route.cc	2011-02-26 14:58:04.903874212 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/test_subnet_route.cc,v 1.15 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/tools/print_peer.cc xorp-1.6/bgp/tools/print_peer.cc
--- xorp-1.6.orig/bgp/tools/print_peer.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/tools/print_peer.cc	2011-02-26 14:58:04.635860074 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/tools/print_peer.cc,v 1.24 2009/01/05 18:30:45 jtc Exp $"
 
 #include "print_peer.hh"
 #include "libxorp/asnum.hh"
diff -rupN xorp-1.6.orig/bgp/tools/print_peers.cc xorp-1.6/bgp/tools/print_peers.cc
--- xorp-1.6.orig/bgp/tools/print_peers.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/tools/print_peers.cc	2011-02-26 14:58:04.631867668 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/tools/print_peers.cc,v 1.12 2009/01/05 18:30:45 jtc Exp $"
 
 #include "print_peer.hh"
 
diff -rupN xorp-1.6.orig/bgp/tools/print_routes.cc xorp-1.6/bgp/tools/print_routes.cc
--- xorp-1.6.orig/bgp/tools/print_routes.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/tools/print_routes.cc	2011-02-26 14:58:04.631867668 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/tools/print_routes.cc,v 1.25 2009/01/05 18:30:45 jtc Exp $"
 
 #include "print_routes.hh"
 
diff -rupN xorp-1.6.orig/bgp/tools/print_routes_main.cc xorp-1.6/bgp/tools/print_routes_main.cc
--- xorp-1.6.orig/bgp/tools/print_routes_main.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/tools/print_routes_main.cc	2011-02-26 14:58:04.627861222 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/tools/print_routes_main.cc,v 1.15 2009/01/05 18:30:45 jtc Exp $"
 
 #include "print_routes.hh"
 #include "bgp/aspath.hh"
diff -rupN xorp-1.6.orig/bgp/tools/xorpsh_print_peers.cc xorp-1.6/bgp/tools/xorpsh_print_peers.cc
--- xorp-1.6.orig/bgp/tools/xorpsh_print_peers.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/tools/xorpsh_print_peers.cc	2011-02-26 14:58:04.639917981 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/tools/xorpsh_print_peers.cc,v 1.10 2009/01/05 18:30:45 jtc Exp $"
 
 #include "print_peer.hh"
 
diff -rupN xorp-1.6.orig/bgp/tools/xorpsh_print_routes.cc xorp-1.6/bgp/tools/xorpsh_print_routes.cc
--- xorp-1.6.orig/bgp/tools/xorpsh_print_routes.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/bgp/tools/xorpsh_print_routes.cc	2011-02-26 14:58:04.623902281 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/tools/xorpsh_print_routes.cc,v 1.19 2009/01/05 18:30:45 jtc Exp $"
 
 #include "print_routes.hh"
 #include "bgp/aspath.hh"
diff -rupN xorp-1.6.orig/bgp/update_attrib.cc xorp-1.6/bgp/update_attrib.cc
--- xorp-1.6.orig/bgp/update_attrib.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/update_attrib.cc	2011-02-26 14:58:04.907864343 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/update_attrib.cc,v 1.25 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/update_packet.cc xorp-1.6/bgp/update_packet.cc
--- xorp-1.6.orig/bgp/update_packet.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/update_packet.cc	2011-02-26 14:58:04.608680878 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/update_packet.cc,v 1.51 2009/01/05 18:30:43 jtc Exp $"
 
 //#define DEBUG_LOGGING
 //#define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/bgp/update_test.cc xorp-1.6/bgp/update_test.cc
--- xorp-1.6.orig/bgp/update_test.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/update_test.cc	2011-02-26 14:58:04.611945378 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/update_test.cc,v 1.23 2009/01/05 18:30:43 jtc Exp $"
 
 #include "bgp_module.h"
 
diff -rupN xorp-1.6.orig/bgp/xrl_target.cc xorp-1.6/bgp/xrl_target.cc
--- xorp-1.6.orig/bgp/xrl_target.cc	2009-01-05 13:30:43.000000000 -0500
+++ xorp-1.6/bgp/xrl_target.cc	2011-02-26 14:58:04.739861845 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/bgp/xrl_target.cc,v 1.70 2009/01/05 18:30:43 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/cli/cli_client.cc xorp-1.6/cli/cli_client.cc
--- xorp-1.6.orig/cli/cli_client.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/cli_client.cc	2011-02-26 14:58:05.215864848 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/cli_client.cc,v 1.64 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/cli_command.cc xorp-1.6/cli/cli_command.cc
--- xorp-1.6.orig/cli/cli_command.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/cli_command.cc	2011-02-26 14:58:05.207885970 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/cli_command.cc,v 1.36 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/cli_command_pipe.cc xorp-1.6/cli/cli_command_pipe.cc
--- xorp-1.6.orig/cli/cli_command_pipe.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/cli_command_pipe.cc	2011-02-26 14:58:05.188174020 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/cli_command_pipe.cc,v 1.18 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/cli_node.cc xorp-1.6/cli/cli_node.cc
--- xorp-1.6.orig/cli/cli_node.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/cli_node.cc	2011-02-26 14:58:05.219861157 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/cli_node.cc,v 1.45 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/cli_node_internal_commands.cc xorp-1.6/cli/cli_node_internal_commands.cc
--- xorp-1.6.orig/cli/cli_node_internal_commands.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/cli_node_internal_commands.cc	2011-02-26 14:58:05.196059935 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/cli_node_internal_commands.cc,v 1.21 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/cli_node_net.cc xorp-1.6/cli/cli_node_net.cc
--- xorp-1.6.orig/cli/cli_node_net.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/cli_node_net.cc	2011-02-26 14:58:05.204082257 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/cli_node_net.cc,v 1.71 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/libtecla/nettest_libtecla.c xorp-1.6/cli/libtecla/nettest_libtecla.c
--- xorp-1.6.orig/cli/libtecla/nettest_libtecla.c	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/cli/libtecla/nettest_libtecla.c	2011-02-26 14:58:05.200178962 -0500
@@ -19,7 +19,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/cli/libtecla/nettest_libtecla.c,v 1.12 2009/01/05 18:30:46 jtc Exp $"
 
 
 /*
diff -rupN xorp-1.6.orig/cli/test_cli.cc xorp-1.6/cli/test_cli.cc
--- xorp-1.6.orig/cli/test_cli.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/test_cli.cc	2011-02-26 14:58:05.192248268 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/test_cli.cc,v 1.48 2009/01/05 18:30:45 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/cli/tools/cli_generic.cc xorp-1.6/cli/tools/cli_generic.cc
--- xorp-1.6.orig/cli/tools/cli_generic.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/cli/tools/cli_generic.cc	2011-02-26 14:58:05.180040638 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/tools/cli_generic.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "cli/cli_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/cli/tools/send_cli_processor_xrl.cc xorp-1.6/cli/tools/send_cli_processor_xrl.cc
--- xorp-1.6.orig/cli/tools/send_cli_processor_xrl.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/cli/tools/send_cli_processor_xrl.cc	2011-02-26 14:58:05.176773457 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/tools/send_cli_processor_xrl.cc,v 1.15 2009/01/05 18:30:46 jtc Exp $"
 
 #include "pim/pim_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/cli/xrl_cli_node.cc xorp-1.6/cli/xrl_cli_node.cc
--- xorp-1.6.orig/cli/xrl_cli_node.cc	2009-01-05 13:30:45.000000000 -0500
+++ xorp-1.6/cli/xrl_cli_node.cc	2011-02-26 14:58:05.183847516 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/cli/xrl_cli_node.cc,v 1.36 2009/01/05 18:30:45 jtc Exp $"
 
 #include "cli_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_config.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_config.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_config.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_config.cc	2011-02-26 14:58:04.067908277 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_config.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_group_record.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_group_record.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_group_record.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_group_record.cc	2011-02-26 14:58:04.056462797 -0500
@@ -23,7 +23,6 @@
 // Copyright (c) 2008 Huawei Technologies Co. Ltd
 //
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_group_record.cc,v 1.7 2009/01/05 18:30:46 jtc Exp $"
 
 //
 // Multicast group record information used by
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_node.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_node.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_node.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_node.cc	2011-02-26 14:58:04.039887604 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_node.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_node_cli.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_node_cli.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_node_cli.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_node_cli.cc	2011-02-26 14:58:04.047878457 -0500
@@ -23,7 +23,6 @@
 // Copyright (c) 2008 Huawei Technologies Co. Ltd
 //
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_node_cli.cc,v 1.6 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_proto.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_proto.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_proto.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_proto.cc	2011-02-26 14:58:04.035866604 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_proto.cc,v 1.5 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_source_record.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_source_record.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_source_record.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_source_record.cc	2011-02-26 14:58:04.080375315 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_source_record.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 //
 // Multicast source record information used by IGMPv3 (RFC 3376) and
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_vif.cc xorp-1.6/contrib/mld6igmp_lite/mld6igmp_vif.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/mld6igmp_vif.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/mld6igmp_vif.cc	2011-02-26 14:58:04.076329503 -0500
@@ -23,7 +23,6 @@
 // Copyright (c) 2008 Huawei Technologies Co. Ltd
 //
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/mld6igmp_vif.cc,v 1.7 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/xorp_igmp.cc xorp-1.6/contrib/mld6igmp_lite/xorp_igmp.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/xorp_igmp.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/xorp_igmp.cc	2011-02-26 14:58:04.044757799 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/xorp_igmp.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/xorp_mld.cc xorp-1.6/contrib/mld6igmp_lite/xorp_mld.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/xorp_mld.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/xorp_mld.cc	2011-02-26 14:58:04.071879462 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/xorp_mld.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/contrib/mld6igmp_lite/xrl_mld6igmp_node.cc xorp-1.6/contrib/mld6igmp_lite/xrl_mld6igmp_node.cc
--- xorp-1.6.orig/contrib/mld6igmp_lite/xrl_mld6igmp_node.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/mld6igmp_lite/xrl_mld6igmp_node.cc	2011-02-26 14:58:04.064325779 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/mld6igmp_lite/xrl_mld6igmp_node.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "mld6igmp_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/debug_io.cc xorp-1.6/contrib/olsr/debug_io.cc
--- xorp-1.6.orig/contrib/olsr/debug_io.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/debug_io.cc	2011-02-26 14:58:04.155868520 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/debug_io.cc,v 1.5 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/emulate_net.cc xorp-1.6/contrib/olsr/emulate_net.cc
--- xorp-1.6.orig/contrib/olsr/emulate_net.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/emulate_net.cc	2011-02-26 14:58:04.095880077 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/emulate_net.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/external.cc xorp-1.6/contrib/olsr/external.cc
--- xorp-1.6.orig/contrib/olsr/external.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/external.cc	2011-02-26 14:58:04.168228529 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/external.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/face.cc xorp-1.6/contrib/olsr/face.cc
--- xorp-1.6.orig/contrib/olsr/face.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/face.cc	2011-02-26 14:58:04.179946594 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/face.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/face_manager.cc xorp-1.6/contrib/olsr/face_manager.cc
--- xorp-1.6.orig/contrib/olsr/face_manager.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/face_manager.cc	2011-02-26 14:58:04.164329426 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/face_manager.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/link.cc xorp-1.6/contrib/olsr/link.cc
--- xorp-1.6.orig/contrib/olsr/link.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/link.cc	2011-02-26 14:58:04.155868520 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/link.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/message.cc xorp-1.6/contrib/olsr/message.cc
--- xorp-1.6.orig/contrib/olsr/message.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/message.cc	2011-02-26 14:58:04.143910904 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/message.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/neighbor.cc xorp-1.6/contrib/olsr/neighbor.cc
--- xorp-1.6.orig/contrib/olsr/neighbor.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/neighbor.cc	2011-02-26 14:58:04.119862959 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/neighbor.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/neighborhood.cc xorp-1.6/contrib/olsr/neighborhood.cc
--- xorp-1.6.orig/contrib/olsr/neighborhood.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/neighborhood.cc	2011-02-26 14:58:04.115869431 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/neighborhood.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/olsr.cc xorp-1.6/contrib/olsr/olsr.cc
--- xorp-1.6.orig/contrib/olsr/olsr.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/olsr.cc	2011-02-26 14:58:04.187875698 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/olsr.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/olsr_types.cc xorp-1.6/contrib/olsr/olsr_types.cc
--- xorp-1.6.orig/contrib/olsr/olsr_types.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/olsr_types.cc	2011-02-26 14:58:04.135861091 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/olsr_types.cc,v 1.5 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/policy_varrw.cc xorp-1.6/contrib/olsr/policy_varrw.cc
--- xorp-1.6.orig/contrib/olsr/policy_varrw.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/policy_varrw.cc	2011-02-26 14:58:04.139868780 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/policy_varrw.cc,v 1.6 2009/01/05 18:30:46 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/profile_vars.cc xorp-1.6/contrib/olsr/profile_vars.cc
--- xorp-1.6.orig/contrib/olsr/profile_vars.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/profile_vars.cc	2011-02-26 14:58:04.107863810 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/profile_vars.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/route_manager.cc xorp-1.6/contrib/olsr/route_manager.cc
--- xorp-1.6.orig/contrib/olsr/route_manager.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/route_manager.cc	2011-02-26 14:58:04.123938836 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/route_manager.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/test_faces.cc xorp-1.6/contrib/olsr/test_faces.cc
--- xorp-1.6.orig/contrib/olsr/test_faces.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/test_faces.cc	2011-02-26 14:58:04.128640408 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/test_faces.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/test_message.cc xorp-1.6/contrib/olsr/test_message.cc
--- xorp-1.6.orig/contrib/olsr/test_message.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/test_message.cc	2011-02-26 14:58:04.083875332 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/test_message.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/test_olsr_types.cc xorp-1.6/contrib/olsr/test_olsr_types.cc
--- xorp-1.6.orig/contrib/olsr/test_olsr_types.cc	2009-01-05 13:30:46.000000000 -0500
+++ xorp-1.6/contrib/olsr/test_olsr_types.cc	2011-02-26 14:58:04.184597610 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/test_olsr_types.cc,v 1.4 2009/01/05 18:30:46 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/test_simulator.cc xorp-1.6/contrib/olsr/test_simulator.cc
--- xorp-1.6.orig/contrib/olsr/test_simulator.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/test_simulator.cc	2011-02-26 14:58:04.103841942 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/test_simulator.cc,v 1.5 2009/01/05 18:30:47 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/tools/clear_database.cc xorp-1.6/contrib/olsr/tools/clear_database.cc
--- xorp-1.6.orig/contrib/olsr/tools/clear_database.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/tools/clear_database.cc	2011-02-26 14:58:04.087862358 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/tools/clear_database.cc,v 1.4 2009/01/05 18:30:47 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/tools/print_databases.cc xorp-1.6/contrib/olsr/tools/print_databases.cc
--- xorp-1.6.orig/contrib/olsr/tools/print_databases.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/tools/print_databases.cc	2011-02-26 14:58:04.091878041 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/tools/print_databases.cc,v 1.4 2009/01/05 18:30:47 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/topology.cc xorp-1.6/contrib/olsr/topology.cc
--- xorp-1.6.orig/contrib/olsr/topology.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/topology.cc	2011-02-26 14:58:04.152897173 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/topology.cc,v 1.5 2009/01/05 18:30:47 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/twohop.cc xorp-1.6/contrib/olsr/twohop.cc
--- xorp-1.6.orig/contrib/olsr/twohop.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/twohop.cc	2011-02-26 14:58:04.147855939 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/twohop.cc,v 1.4 2009/01/05 18:30:47 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/xorp_olsr.cc xorp-1.6/contrib/olsr/xorp_olsr.cc
--- xorp-1.6.orig/contrib/olsr/xorp_olsr.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/xorp_olsr.cc	2011-02-26 14:58:04.107863810 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/xorp_olsr.cc,v 1.4 2009/01/05 18:30:47 jtc Exp $"
 
 #include "olsr_module.h"
 
diff -rupN xorp-1.6.orig/contrib/olsr/xrl_io.cc xorp-1.6/contrib/olsr/xrl_io.cc
--- xorp-1.6.orig/contrib/olsr/xrl_io.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/xrl_io.cc	2011-02-26 14:58:04.175861198 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/xrl_io.cc,v 1.5 2009/01/05 18:30:47 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/xrl_port.cc xorp-1.6/contrib/olsr/xrl_port.cc
--- xorp-1.6.orig/contrib/olsr/xrl_port.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/xrl_port.cc	2011-02-26 14:58:04.175861198 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/xrl_port.cc,v 1.4 2009/01/05 18:30:47 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/xrl_queue.cc xorp-1.6/contrib/olsr/xrl_queue.cc
--- xorp-1.6.orig/contrib/olsr/xrl_queue.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/xrl_queue.cc	2011-02-26 14:58:04.168228529 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/xrl_queue.cc,v 1.4 2009/01/05 18:30:47 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/olsr/xrl_target.cc xorp-1.6/contrib/olsr/xrl_target.cc
--- xorp-1.6.orig/contrib/olsr/xrl_target.cc	2009-01-05 13:30:47.000000000 -0500
+++ xorp-1.6/contrib/olsr/xrl_target.cc	2011-02-26 14:58:04.135861091 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/contrib/olsr/xrl_target.cc,v 1.5 2009/01/05 18:30:47 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/loadprotocol.c xorp-1.6/contrib/win32/xorprtm/loadprotocol.c
--- xorp-1.6.orig/contrib/win32/xorprtm/loadprotocol.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/loadprotocol.c	2011-02-26 14:58:04.211883384 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/loadprotocol.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * This file is derived from code which is under the following copyright:
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/mibmgr.c xorp-1.6/contrib/win32/xorprtm/mibmgr.c
--- xorp-1.6.orig/contrib/win32/xorprtm/mibmgr.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/mibmgr.c	2011-02-26 14:58:04.187875698 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/mibmgr.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * This file is derived from code which is under the following copyright:
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/print_rtmsg.c xorp-1.6/contrib/win32/xorprtm/print_rtmsg.c
--- xorp-1.6.orig/contrib/win32/xorprtm/print_rtmsg.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/print_rtmsg.c	2011-02-26 14:58:04.203861527 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/print_rtmsg.c,v 1.9 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/rmapi.c xorp-1.6/contrib/win32/xorprtm/rmapi.c
--- xorp-1.6.orig/contrib/win32/xorprtm/rmapi.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/rmapi.c	2011-02-26 14:58:04.216341761 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/rmapi.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * This file is derived from code which is under the following copyright:
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/sync.c xorp-1.6/contrib/win32/xorprtm/sync.c
--- xorp-1.6.orig/contrib/win32/xorprtm/sync.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/sync.c	2011-02-26 14:58:04.195869160 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/sync.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * This file is derived from code which is under the following copyright:
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/test_monitor.c xorp-1.6/contrib/win32/xorprtm/test_monitor.c
--- xorp-1.6.orig/contrib/win32/xorprtm/test_monitor.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/test_monitor.c	2011-02-26 14:58:04.208916442 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/test_monitor.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * test pipe client program
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/test_routeadd.c xorp-1.6/contrib/win32/xorprtm/test_routeadd.c
--- xorp-1.6.orig/contrib/win32/xorprtm/test_routeadd.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/test_routeadd.c	2011-02-26 14:58:04.195869160 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/test_routeadd.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * test pipe client program
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/test_routeadddelete.c xorp-1.6/contrib/win32/xorprtm/test_routeadddelete.c
--- xorp-1.6.orig/contrib/win32/xorprtm/test_routeadddelete.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/test_routeadddelete.c	2011-02-26 14:58:04.200015207 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/test_routeadddelete.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * test pipe client program
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/test_routeaddwait.c xorp-1.6/contrib/win32/xorprtm/test_routeaddwait.c
--- xorp-1.6.orig/contrib/win32/xorprtm/test_routeaddwait.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/test_routeaddwait.c	2011-02-26 14:58:04.203861527 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/test_routeaddwait.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * test pipe client program
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/utils.c xorp-1.6/contrib/win32/xorprtm/utils.c
--- xorp-1.6.orig/contrib/win32/xorprtm/utils.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/utils.c	2011-02-26 14:58:04.191867772 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/utils.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /*
  * This file is derived from code which is under the following copyright:
diff -rupN xorp-1.6.orig/contrib/win32/xorprtm/xorprtm.c xorp-1.6/contrib/win32/xorprtm/xorprtm.c
--- xorp-1.6.orig/contrib/win32/xorprtm/xorprtm.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/contrib/win32/xorprtm/xorprtm.c	2011-02-26 14:58:04.224682731 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/contrib/win32/xorprtm/xorprtm.c,v 1.8 2009/01/05 18:30:48 jtc Exp $"
 
 /* XXX: SORT FUNCTIONS IN THIS FILE */
 
diff -rupN xorp-1.6.orig/devnotes/template_gpl.c xorp-1.6/devnotes/template_gpl.c
--- xorp-1.6.orig/devnotes/template_gpl.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/devnotes/template_gpl.c	2011-02-26 14:58:05.500048706 -0500
@@ -20,4 +20,3 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/devnotes/template_gpl.c,v 1.2 2009/01/05 18:30:48 jtc Exp $"
diff -rupN xorp-1.6.orig/devnotes/template_gpl.cc xorp-1.6/devnotes/template_gpl.cc
--- xorp-1.6.orig/devnotes/template_gpl.cc	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/devnotes/template_gpl.cc	2011-02-26 14:58:05.496598481 -0500
@@ -18,4 +18,3 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/devnotes/template_gpl.cc,v 1.2 2009/01/05 18:30:48 jtc Exp $"
diff -rupN xorp-1.6.orig/devnotes/template_lgpl.c xorp-1.6/devnotes/template_lgpl.c
--- xorp-1.6.orig/devnotes/template_lgpl.c	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/devnotes/template_lgpl.c	2011-02-26 14:58:05.503842586 -0500
@@ -21,4 +21,3 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/devnotes/template_lgpl.c,v 1.2 2009/01/05 18:30:48 jtc Exp $"
diff -rupN xorp-1.6.orig/devnotes/template_lgpl.cc xorp-1.6/devnotes/template_lgpl.cc
--- xorp-1.6.orig/devnotes/template_lgpl.cc	2009-01-05 13:30:48.000000000 -0500
+++ xorp-1.6/devnotes/template_lgpl.cc	2011-02-26 14:58:05.503842586 -0500
@@ -19,4 +19,3 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/devnotes/template_lgpl.cc,v 1.2 2009/01/05 18:30:48 jtc Exp $"
diff -rupN xorp-1.6.orig/examples/usermgr/test_usermgr.cc xorp-1.6/examples/usermgr/test_usermgr.cc
--- xorp-1.6.orig/examples/usermgr/test_usermgr.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/examples/usermgr/test_usermgr.cc	2011-02-26 14:58:02.636091069 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/examples/usermgr/test_usermgr.cc,v 1.4 2009/01/05 18:30:49 jtc Exp $"
 
 /*
  * Test the UserDB implementation.
diff -rupN xorp-1.6.orig/examples/usermgr/usermgr.cc xorp-1.6/examples/usermgr/usermgr.cc
--- xorp-1.6.orig/examples/usermgr/usermgr.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/examples/usermgr/usermgr.cc	2011-02-26 14:58:02.636091069 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/examples/usermgr/usermgr.cc,v 1.5 2009/01/05 18:30:49 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "usermgr_module.h"
diff -rupN xorp-1.6.orig/examples/usermgr/xorp_usermgr.cc xorp-1.6/examples/usermgr/xorp_usermgr.cc
--- xorp-1.6.orig/examples/usermgr/xorp_usermgr.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/examples/usermgr/xorp_usermgr.cc	2011-02-26 14:58:02.643898121 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/examples/usermgr/xorp_usermgr.cc,v 1.4 2009/01/05 18:30:49 jtc Exp $"
 
 #include <stdio.h>
 
diff -rupN xorp-1.6.orig/examples/usermgr/xrl_target.cc xorp-1.6/examples/usermgr/xrl_target.cc
--- xorp-1.6.orig/examples/usermgr/xrl_target.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/examples/usermgr/xrl_target.cc	2011-02-26 14:58:02.640557115 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/examples/usermgr/xrl_target.cc,v 1.3 2009/01/05 18:30:49 jtc Exp $"
 
 #include "usermgr_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/click_socket.cc xorp-1.6/fea/data_plane/control_socket/click_socket.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/click_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/click_socket.cc	2011-02-26 14:58:02.883958422 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/click_socket.cc,v 1.7 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/netlink_socket.cc xorp-1.6/fea/data_plane/control_socket/netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/netlink_socket.cc	2011-02-26 14:58:02.879932449 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/netlink_socket.cc,v 1.7 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/netlink_socket_utilities.cc xorp-1.6/fea/data_plane/control_socket/netlink_socket_utilities.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/netlink_socket_utilities.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/netlink_socket_utilities.cc	2011-02-26 14:58:02.891865001 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/netlink_socket_utilities.cc,v 1.17 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/routing_socket.cc xorp-1.6/fea/data_plane/control_socket/routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/routing_socket.cc	2011-02-26 14:58:02.899940137 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/routing_socket.cc,v 1.7 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/routing_socket_utilities.cc xorp-1.6/fea/data_plane/control_socket/routing_socket_utilities.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/routing_socket_utilities.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/routing_socket_utilities.cc	2011-02-26 14:58:02.891865001 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/routing_socket_utilities.cc,v 1.21 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/windows_rras_support.cc xorp-1.6/fea/data_plane/control_socket/windows_rras_support.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/windows_rras_support.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/windows_rras_support.cc	2011-02-26 14:58:02.896077107 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/windows_rras_support.cc,v 1.6 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/control_socket/windows_rtm_pipe.cc xorp-1.6/fea/data_plane/control_socket/windows_rtm_pipe.cc
--- xorp-1.6.orig/fea/data_plane/control_socket/windows_rtm_pipe.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/control_socket/windows_rtm_pipe.cc	2011-02-26 14:58:02.887896347 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/control_socket/windows_rtm_pipe.cc,v 1.6 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_click.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_click.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_click.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_click.cc	2011-02-26 14:58:03.000740279 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_get_click.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_dummy.cc	2011-02-26 14:58:03.019867537 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_get_dummy.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_iphelper.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_iphelper.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_iphelper.cc	2011-02-26 14:58:03.028073419 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_get_iphelper.cc,v 1.16 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_netlink_socket.cc	2011-02-26 14:58:02.948149160 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_get_netlink_socket.cc,v 1.22 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_routing_socket.cc	2011-02-26 14:58:02.988064610 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_get_routing_socket.cc,v 1.19 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_rtmv2.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_rtmv2.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_get_rtmv2.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_get_rtmv2.cc	2011-02-26 14:58:02.932058662 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_get_rtmv2.cc,v 1.21 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_dummy.cc	2011-02-26 14:58:02.939866925 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_observer_dummy.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_iphelper.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_iphelper.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_iphelper.cc	2011-02-26 14:58:03.031907221 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_observer_iphelper.cc,v 1.12 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_netlink_socket.cc	2011-02-26 14:58:03.016676715 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_observer_netlink_socket.cc,v 1.15 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_routing_socket.cc	2011-02-26 14:58:03.043890327 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_observer_routing_socket.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_rtmv2.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_rtmv2.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_observer_rtmv2.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_observer_rtmv2.cc	2011-02-26 14:58:02.959862876 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_observer_rtmv2.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_parse_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_parse_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_parse_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_parse_netlink_socket.cc	2011-02-26 14:58:02.932058662 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_parse_netlink_socket.cc,v 1.16 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_parse_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_parse_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_parse_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_parse_routing_socket.cc	2011-02-26 14:58:02.979885369 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_parse_routing_socket.cc,v 1.19 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_click.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_click.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_click.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_click.cc	2011-02-26 14:58:02.948149160 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_set_click.cc,v 1.16 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_dummy.cc	2011-02-26 14:58:03.000740279 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_set_dummy.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_iphelper.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_iphelper.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_iphelper.cc	2011-02-26 14:58:02.991920799 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_set_iphelper.cc,v 1.18 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_netlink_socket.cc	2011-02-26 14:58:02.959862876 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_set_netlink_socket.cc,v 1.23 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_routing_socket.cc	2011-02-26 14:58:03.040263426 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_set_routing_socket.cc,v 1.22 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_rtmv2.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_rtmv2.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_entry_set_rtmv2.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_entry_set_rtmv2.cc	2011-02-26 14:58:03.028073419 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_entry_set_rtmv2.cc,v 1.23 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_dummy.cc	2011-02-26 14:58:03.008246440 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_forwarding_dummy.cc,v 1.8 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_proc_linux.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_proc_linux.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_proc_linux.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_proc_linux.cc	2011-02-26 14:58:03.011893547 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_forwarding_proc_linux.cc,v 1.7 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_solaris.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_solaris.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_solaris.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_solaris.cc	2011-02-26 14:58:02.943867881 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_forwarding_solaris.cc,v 1.7 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_sysctl.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_sysctl.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_sysctl.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_sysctl.cc	2011-02-26 14:58:02.983866711 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_forwarding_sysctl.cc,v 1.6 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_windows.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_windows.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_forwarding_windows.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_forwarding_windows.cc	2011-02-26 14:58:03.052262099 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_forwarding_windows.cc,v 1.9 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_click.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_click.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_click.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_click.cc	2011-02-26 14:58:03.040263426 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_get_click.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_dummy.cc	2011-02-26 14:58:02.972213797 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_get_dummy.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_iphelper.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_iphelper.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_iphelper.cc	2011-02-26 14:58:03.048492904 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_get_iphelper.cc,v 1.18 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_netlink_socket.cc	2011-02-26 14:58:02.955961183 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_get_netlink_socket.cc,v 1.18 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_sysctl.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_sysctl.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_get_sysctl.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_get_sysctl.cc	2011-02-26 14:58:02.963869157 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_get_sysctl.cc,v 1.19 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_dummy.cc	2011-02-26 14:58:02.991920799 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_observer_dummy.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_iphelper.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_iphelper.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_iphelper.cc	2011-02-26 14:58:02.968641440 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_observer_iphelper.cc,v 1.12 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_netlink_socket.cc	2011-02-26 14:58:03.003890854 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_observer_netlink_socket.cc,v 1.19 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_routing_socket.cc	2011-02-26 14:58:02.976172843 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_observer_routing_socket.cc,v 1.19 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.cc	2011-02-26 14:58:03.036790326 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.cc,v 1.20 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_parse_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_parse_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_parse_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_parse_netlink_socket.cc	2011-02-26 14:58:02.995862589 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_parse_netlink_socket.cc,v 1.15 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_parse_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_parse_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_parse_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_parse_routing_socket.cc	2011-02-26 14:58:03.008246440 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_parse_routing_socket.cc,v 1.19 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_click.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_click.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_click.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_click.cc	2011-02-26 14:58:03.019867537 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_set_click.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_dummy.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_dummy.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_dummy.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_dummy.cc	2011-02-26 14:58:03.023943615 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_set_dummy.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_iphelper.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_iphelper.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_iphelper.cc	2011-02-26 14:58:02.952600705 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_set_iphelper.cc,v 1.14 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_netlink_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_netlink_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_netlink_socket.cc	2011-02-26 14:58:02.936582572 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_set_netlink_socket.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_routing_socket.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_routing_socket.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_routing_socket.cc	2011-02-26 14:58:02.972213797 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_set_routing_socket.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_rtmv2.cc xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_rtmv2.cc
--- xorp-1.6.orig/fea/data_plane/fibconfig/fibconfig_table_set_rtmv2.cc	2009-01-05 13:30:51.000000000 -0500
+++ xorp-1.6/fea/data_plane/fibconfig/fibconfig_table_set_rtmv2.cc	2011-02-26 14:58:02.979885369 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/fibconfig/fibconfig_table_set_rtmv2.cc,v 1.13 2009/01/05 18:30:51 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_get_dummy.cc xorp-1.6/fea/data_plane/firewall/firewall_get_dummy.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_get_dummy.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_get_dummy.cc	2011-02-26 14:58:02.835863941 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_get_dummy.cc,v 1.5 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_get_ipfw2.cc xorp-1.6/fea/data_plane/firewall/firewall_get_ipfw2.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_get_ipfw2.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_get_ipfw2.cc	2011-02-26 14:58:02.832746631 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_get_ipfw2.cc,v 1.6 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_get_netfilter.cc xorp-1.6/fea/data_plane/firewall/firewall_get_netfilter.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_get_netfilter.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_get_netfilter.cc	2011-02-26 14:58:02.848213722 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_get_netfilter.cc,v 1.4 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_get_pf.cc xorp-1.6/fea/data_plane/firewall/firewall_get_pf.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_get_pf.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_get_pf.cc	2011-02-26 14:58:02.851968902 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_get_pf.cc,v 1.4 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_set_dummy.cc xorp-1.6/fea/data_plane/firewall/firewall_set_dummy.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_set_dummy.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_set_dummy.cc	2011-02-26 14:58:02.851968902 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_set_dummy.cc,v 1.7 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_set_ipfw2.cc xorp-1.6/fea/data_plane/firewall/firewall_set_ipfw2.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_set_ipfw2.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_set_ipfw2.cc	2011-02-26 14:58:02.844491108 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_set_ipfw2.cc,v 1.7 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_set_netfilter.cc xorp-1.6/fea/data_plane/firewall/firewall_set_netfilter.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_set_netfilter.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_set_netfilter.cc	2011-02-26 14:58:02.860189012 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_set_netfilter.cc,v 1.6 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/firewall/firewall_set_pf.cc xorp-1.6/fea/data_plane/firewall/firewall_set_pf.cc
--- xorp-1.6.orig/fea/data_plane/firewall/firewall_set_pf.cc	2009-01-05 13:30:52.000000000 -0500
+++ xorp-1.6/fea/data_plane/firewall/firewall_set_pf.cc	2011-02-26 14:58:02.839912006 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/firewall/firewall_set_pf.cc,v 1.6 2009/01/05 18:30:52 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_click.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_click.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_click.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_click.cc	2011-02-26 14:58:02.728495696 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_click.cc,v 1.13 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_dummy.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_dummy.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_dummy.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_dummy.cc	2011-02-26 14:58:02.799873173 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_dummy.cc,v 1.15 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_getifaddrs.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_getifaddrs.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_getifaddrs.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_getifaddrs.cc	2011-02-26 14:58:02.827860086 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_getifaddrs.cc,v 1.14 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_ioctl.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_ioctl.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_ioctl.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_ioctl.cc	2011-02-26 14:58:02.807862747 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_ioctl.cc,v 1.18 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_iphelper.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_iphelper.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_iphelper.cc	2011-02-26 14:58:02.803868505 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_iphelper.cc,v 1.17 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_netlink_socket.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_netlink_socket.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_netlink_socket.cc	2011-02-26 14:58:02.751904408 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_netlink_socket.cc,v 1.20 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_proc_linux.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_proc_linux.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_proc_linux.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_proc_linux.cc	2011-02-26 14:58:02.768435103 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_proc_linux.cc,v 1.27 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_sysctl.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_sysctl.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_get_sysctl.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_get_sysctl.cc	2011-02-26 14:58:02.819880599 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_get_sysctl.cc,v 1.15 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_media.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_media.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_media.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_media.cc	2011-02-26 14:58:02.759891472 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_media.cc,v 1.10 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_dummy.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_dummy.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_dummy.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_dummy.cc	2011-02-26 14:58:02.735868900 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_observer_dummy.cc,v 1.13 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_iphelper.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_iphelper.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_iphelper.cc	2011-02-26 14:58:02.763865965 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_observer_iphelper.cc,v 1.12 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_netlink_socket.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_netlink_socket.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_netlink_socket.cc	2011-02-26 14:58:02.751904408 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_observer_netlink_socket.cc,v 1.19 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_routing_socket.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_observer_routing_socket.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_observer_routing_socket.cc	2011-02-26 14:58:02.796143485 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_observer_routing_socket.cc,v 1.18 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_getifaddrs.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_getifaddrs.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_getifaddrs.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_getifaddrs.cc	2011-02-26 14:58:02.783862229 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_parse_getifaddrs.cc,v 1.24 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_ioctl.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_ioctl.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_ioctl.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_ioctl.cc	2011-02-26 14:58:02.748005591 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_parse_ioctl.cc,v 1.23 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc	2011-02-26 14:58:02.740428744 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc,v 1.28 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_routing_socket.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_routing_socket.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_parse_routing_socket.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_parse_routing_socket.cc	2011-02-26 14:58:02.776203671 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_parse_routing_socket.cc,v 1.29 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_bsd.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_bsd.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_bsd.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_bsd.cc	2011-02-26 14:58:02.743881516 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_property_bsd.cc,v 1.5 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_dummy.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_dummy.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_dummy.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_dummy.cc	2011-02-26 14:58:02.772210474 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_property_dummy.cc,v 1.7 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_linux.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_linux.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_linux.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_linux.cc	2011-02-26 14:58:02.728495696 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_property_linux.cc,v 1.5 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_solaris.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_solaris.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_solaris.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_solaris.cc	2011-02-26 14:58:02.796143485 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_property_solaris.cc,v 1.5 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_windows.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_windows.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_property_windows.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_property_windows.cc	2011-02-26 14:58:02.791884430 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_property_windows.cc,v 1.5 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_set.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_set.cc	2011-02-26 14:58:02.823864114 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_set.cc,v 1.26 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_click.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_click.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_click.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_click.cc	2011-02-26 14:58:02.788357267 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_set_click.cc,v 1.23 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_dummy.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_dummy.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_dummy.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_dummy.cc	2011-02-26 14:58:02.832746631 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_set_dummy.cc,v 1.21 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_ioctl.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_ioctl.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_ioctl.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_ioctl.cc	2011-02-26 14:58:02.812778359 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_set_ioctl.cc,v 1.21 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_iphelper.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_iphelper.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_iphelper.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_iphelper.cc	2011-02-26 14:58:02.732141691 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_set_iphelper.cc,v 1.21 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc	2011-02-26 14:58:02.819880599 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_set_netlink_socket.cc,v 1.26 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_get_bsd.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_get_bsd.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_get_bsd.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_get_bsd.cc	2011-02-26 14:58:02.779897563 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_vlan_get_bsd.cc,v 1.11 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_get_dummy.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_get_dummy.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_get_dummy.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_get_dummy.cc	2011-02-26 14:58:02.803868505 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_vlan_get_dummy.cc,v 1.6 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc	2011-02-26 14:58:02.723863239 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_vlan_get_linux.cc,v 1.8 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_set_bsd.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_set_bsd.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_set_bsd.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_set_bsd.cc	2011-02-26 14:58:02.779897563 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_vlan_set_bsd.cc,v 1.13 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_set_dummy.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_set_dummy.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_set_dummy.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_set_dummy.cc	2011-02-26 14:58:02.756405347 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_vlan_set_dummy.cc,v 1.9 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc
--- xorp-1.6.orig/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc	2009-01-05 13:30:53.000000000 -0500
+++ xorp-1.6/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc	2011-02-26 14:58:02.759891472 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/ifconfig/ifconfig_vlan_set_linux.cc,v 1.11 2009/01/05 18:30:53 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/io/io_ip_dummy.cc xorp-1.6/fea/data_plane/io/io_ip_dummy.cc
--- xorp-1.6.orig/fea/data_plane/io/io_ip_dummy.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/io/io_ip_dummy.cc	2011-02-26 14:58:02.923887912 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/io/io_ip_dummy.cc,v 1.6 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // I/O IP raw communication support.
diff -rupN xorp-1.6.orig/fea/data_plane/io/io_ip_socket.cc xorp-1.6/fea/data_plane/io/io_ip_socket.cc
--- xorp-1.6.orig/fea/data_plane/io/io_ip_socket.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/io/io_ip_socket.cc	2011-02-26 14:58:02.915874659 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/io/io_ip_socket.cc,v 1.29 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // I/O IP raw communication support.
diff -rupN xorp-1.6.orig/fea/data_plane/io/io_link_dummy.cc xorp-1.6/fea/data_plane/io/io_link_dummy.cc
--- xorp-1.6.orig/fea/data_plane/io/io_link_dummy.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/io/io_link_dummy.cc	2011-02-26 14:58:02.923887912 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/io/io_link_dummy.cc,v 1.7 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // I/O link raw communication support.
diff -rupN xorp-1.6.orig/fea/data_plane/io/io_link_pcap.cc xorp-1.6/fea/data_plane/io/io_link_pcap.cc
--- xorp-1.6.orig/fea/data_plane/io/io_link_pcap.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/io/io_link_pcap.cc	2011-02-26 14:58:02.920354669 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/io/io_link_pcap.cc,v 1.21 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // I/O link raw communication support.
diff -rupN xorp-1.6.orig/fea/data_plane/io/io_tcpudp_dummy.cc xorp-1.6/fea/data_plane/io/io_tcpudp_dummy.cc
--- xorp-1.6.orig/fea/data_plane/io/io_tcpudp_dummy.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/io/io_tcpudp_dummy.cc	2011-02-26 14:58:02.927867929 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/io/io_tcpudp_dummy.cc,v 1.10 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // I/O TCP/UDP communication support.
diff -rupN xorp-1.6.orig/fea/data_plane/io/io_tcpudp_socket.cc xorp-1.6/fea/data_plane/io/io_tcpudp_socket.cc
--- xorp-1.6.orig/fea/data_plane/io/io_tcpudp_socket.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/io/io_tcpudp_socket.cc	2011-02-26 14:58:02.907865240 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/io/io_tcpudp_socket.cc,v 1.27 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // I/O TCP/UDP communication support.
diff -rupN xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_bsd.cc xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_bsd.cc
--- xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_bsd.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_bsd.cc	2011-02-26 14:58:02.872189885 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/managers/fea_data_plane_manager_bsd.cc,v 1.12 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_click.cc xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_click.cc
--- xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_click.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_click.cc	2011-02-26 14:58:02.860189012 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/managers/fea_data_plane_manager_click.cc,v 1.11 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_dummy.cc xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_dummy.cc
--- xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_dummy.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_dummy.cc	2011-02-26 14:58:02.867907518 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/managers/fea_data_plane_manager_dummy.cc,v 1.13 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_linux.cc xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_linux.cc
--- xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_linux.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_linux.cc	2011-02-26 14:58:02.864389334 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/managers/fea_data_plane_manager_linux.cc,v 1.12 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_windows.cc xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_windows.cc
--- xorp-1.6.orig/fea/data_plane/managers/fea_data_plane_manager_windows.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/data_plane/managers/fea_data_plane_manager_windows.cc	2011-02-26 14:58:02.872189885 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/data_plane/managers/fea_data_plane_manager_windows.cc,v 1.11 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/fea_data_plane_manager.cc xorp-1.6/fea/fea_data_plane_manager.cc
--- xorp-1.6.orig/fea/fea_data_plane_manager.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/fea_data_plane_manager.cc	2011-02-26 14:58:03.195873698 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/fea_data_plane_manager.cc,v 1.13 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/fea_io.cc xorp-1.6/fea/fea_io.cc
--- xorp-1.6.orig/fea/fea_io.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/fea_io.cc	2011-02-26 14:58:03.104535835 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/fea_io.cc,v 1.8 2009/01/05 18:30:49 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/fea/fea_node.cc xorp-1.6/fea/fea_node.cc
--- xorp-1.6.orig/fea/fea_node.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/fea_node.cc	2011-02-26 14:58:03.063894339 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/fea_node.cc,v 1.22 2009/01/05 18:30:49 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/fea/fibconfig.cc xorp-1.6/fea/fibconfig.cc
--- xorp-1.6.orig/fea/fibconfig.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/fibconfig.cc	2011-02-26 14:58:03.144581330 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/fibconfig.cc,v 1.22 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/fibconfig_forwarding.cc xorp-1.6/fea/fibconfig_forwarding.cc
--- xorp-1.6.orig/fea/fibconfig_forwarding.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/fibconfig_forwarding.cc	2011-02-26 14:58:03.180240152 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/fibconfig_forwarding.cc,v 1.6 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/fibconfig_transaction.cc xorp-1.6/fea/fibconfig_transaction.cc
--- xorp-1.6.orig/fea/fibconfig_transaction.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/fibconfig_transaction.cc	2011-02-26 14:58:03.052262099 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/fibconfig_transaction.cc,v 1.9 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/firewall_entry.cc xorp-1.6/fea/firewall_entry.cc
--- xorp-1.6.orig/fea/firewall_entry.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/firewall_entry.cc	2011-02-26 14:58:03.067968114 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/firewall_entry.cc,v 1.5 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/firewall_manager.cc xorp-1.6/fea/firewall_manager.cc
--- xorp-1.6.orig/fea/firewall_manager.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/firewall_manager.cc	2011-02-26 14:58:03.167942040 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/firewall_manager.cc,v 1.9 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/firewall_transaction.cc xorp-1.6/fea/firewall_transaction.cc
--- xorp-1.6.orig/fea/firewall_transaction.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/firewall_transaction.cc	2011-02-26 14:58:03.100137195 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/firewall_transaction.cc,v 1.4 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/ifconfig.cc xorp-1.6/fea/ifconfig.cc
--- xorp-1.6.orig/fea/ifconfig.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/ifconfig.cc	2011-02-26 14:58:03.159845378 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/ifconfig.cc,v 1.86 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/ifconfig_property.cc xorp-1.6/fea/ifconfig_property.cc
--- xorp-1.6.orig/fea/ifconfig_property.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/ifconfig_property.cc	2011-02-26 14:58:03.163881042 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/ifconfig_property.cc,v 1.5 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/ifconfig_reporter.cc xorp-1.6/fea/ifconfig_reporter.cc
--- xorp-1.6.orig/fea/ifconfig_reporter.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/ifconfig_reporter.cc	2011-02-26 14:58:03.163881042 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/ifconfig_reporter.cc,v 1.10 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/ifconfig_transaction.cc xorp-1.6/fea/ifconfig_transaction.cc
--- xorp-1.6.orig/fea/ifconfig_transaction.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/ifconfig_transaction.cc	2011-02-26 14:58:03.147873090 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/ifconfig_transaction.cc,v 1.7 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/iftree.cc xorp-1.6/fea/iftree.cc
--- xorp-1.6.orig/fea/iftree.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/iftree.cc	2011-02-26 14:58:03.116391542 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/iftree.cc,v 1.66 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/io_ip.cc xorp-1.6/fea/io_ip.cc
--- xorp-1.6.orig/fea/io_ip.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/io_ip.cc	2011-02-26 14:58:03.123884069 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/io_ip.cc,v 1.5 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/io_ip_manager.cc xorp-1.6/fea/io_ip_manager.cc
--- xorp-1.6.orig/fea/io_ip_manager.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/io_ip_manager.cc	2011-02-26 14:58:03.055932118 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/io_ip_manager.cc,v 1.15 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/io_link.cc xorp-1.6/fea/io_link.cc
--- xorp-1.6.orig/fea/io_link.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/io_link.cc	2011-02-26 14:58:02.720251009 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/io_link.cc,v 1.7 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/io_link_manager.cc xorp-1.6/fea/io_link_manager.cc
--- xorp-1.6.orig/fea/io_link_manager.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/io_link_manager.cc	2011-02-26 14:58:03.072394292 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/io_link_manager.cc,v 1.15 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/io_tcpudp.cc xorp-1.6/fea/io_tcpudp.cc
--- xorp-1.6.orig/fea/io_tcpudp.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/io_tcpudp.cc	2011-02-26 14:58:03.151862356 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/io_tcpudp.cc,v 1.8 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/io_tcpudp_manager.cc xorp-1.6/fea/io_tcpudp_manager.cc
--- xorp-1.6.orig/fea/io_tcpudp_manager.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/io_tcpudp_manager.cc	2011-02-26 14:58:03.084354973 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/io_tcpudp_manager.cc,v 1.12 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/libfeaclient_bridge.cc xorp-1.6/fea/libfeaclient_bridge.cc
--- xorp-1.6.orig/fea/libfeaclient_bridge.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/libfeaclient_bridge.cc	2011-02-26 14:58:03.131877065 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/libfeaclient_bridge.cc,v 1.39 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/mfea_config.cc xorp-1.6/fea/mfea_config.cc
--- xorp-1.6.orig/fea/mfea_config.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/mfea_config.cc	2011-02-26 14:58:03.139883886 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/mfea_config.cc,v 1.25 2009/01/05 18:30:49 jtc Exp $"
 
 //
 // TODO: a temporary solution for various MFEA configuration
diff -rupN xorp-1.6.orig/fea/mfea_dataflow.cc xorp-1.6/fea/mfea_dataflow.cc
--- xorp-1.6.orig/fea/mfea_dataflow.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/mfea_dataflow.cc	2011-02-26 14:58:02.711866237 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/mfea_dataflow.cc,v 1.12 2009/01/05 18:30:49 jtc Exp $"
 
 //
 // MFEA (Multicast Forwarding Engine Abstraction) dataflow implementation.
diff -rupN xorp-1.6.orig/fea/mfea_mrouter.cc xorp-1.6/fea/mfea_mrouter.cc
--- xorp-1.6.orig/fea/mfea_mrouter.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/mfea_mrouter.cc	2011-02-26 14:58:03.191864304 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/mfea_mrouter.cc,v 1.67 2009/01/05 18:30:49 jtc Exp $"
 
 //
 // Multicast routing kernel-access specific implementation.
diff -rupN xorp-1.6.orig/fea/mfea_node.cc xorp-1.6/fea/mfea_node.cc
--- xorp-1.6.orig/fea/mfea_node.cc	2011-02-26 14:57:00.547862119 -0500
+++ xorp-1.6/fea/mfea_node.cc	2011-02-26 14:58:03.180240152 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/mfea_node.cc,v 1.93 2009/01/05 18:30:49 jtc Exp $"
 
 //
 // MFEA (Multicast Forwarding Engine Abstraction) implementation.
diff -rupN xorp-1.6.orig/fea/mfea_node_cli.cc xorp-1.6/fea/mfea_node_cli.cc
--- xorp-1.6.orig/fea/mfea_node_cli.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/mfea_node_cli.cc	2011-02-26 14:58:03.107879296 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/mfea_node_cli.cc,v 1.27 2009/01/05 18:30:49 jtc Exp $"
 
 //
 // MFEA (Multicast Forwarding Engine Abstraction) CLI implementation
diff -rupN xorp-1.6.orig/fea/mfea_vif.cc xorp-1.6/fea/mfea_vif.cc
--- xorp-1.6.orig/fea/mfea_vif.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/mfea_vif.cc	2011-02-26 14:58:03.171909750 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/mfea_vif.cc,v 1.22 2009/01/05 18:30:49 jtc Exp $"
 
 //
 // MFEA virtual interfaces implementation.
diff -rupN xorp-1.6.orig/fea/nexthop_port_mapper.cc xorp-1.6/fea/nexthop_port_mapper.cc
--- xorp-1.6.orig/fea/nexthop_port_mapper.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/nexthop_port_mapper.cc	2011-02-26 14:58:03.075874826 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/nexthop_port_mapper.cc,v 1.15 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/profile_vars.cc xorp-1.6/fea/profile_vars.cc
--- xorp-1.6.orig/fea/profile_vars.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/profile_vars.cc	2011-02-26 14:58:02.720251009 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/profile_vars.cc,v 1.10 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/test_fea_rawlink.cc xorp-1.6/fea/test_fea_rawlink.cc
--- xorp-1.6.orig/fea/test_fea_rawlink.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/test_fea_rawlink.cc	2011-02-26 14:58:03.151862356 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/test_fea_rawlink.cc,v 1.8 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/test_xrl_sockets4_udp.cc xorp-1.6/fea/test_xrl_sockets4_udp.cc
--- xorp-1.6.orig/fea/test_xrl_sockets4_udp.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/test_xrl_sockets4_udp.cc	2011-02-26 14:58:03.191864304 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/test_xrl_sockets4_udp.cc,v 1.27 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/tools/show_interfaces.cc xorp-1.6/fea/tools/show_interfaces.cc
--- xorp-1.6.orig/fea/tools/show_interfaces.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fea/tools/show_interfaces.cc	2011-02-26 14:58:02.716675765 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/tools/show_interfaces.cc,v 1.31 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fea/fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/xorp_fea.cc xorp-1.6/fea/xorp_fea.cc
--- xorp-1.6.orig/fea/xorp_fea.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/xorp_fea.cc	2011-02-26 14:58:03.136080781 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xorp_fea.cc,v 1.7 2009/01/05 18:30:49 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/xrl_fea_io.cc xorp-1.6/fea/xrl_fea_io.cc
--- xorp-1.6.orig/fea/xrl_fea_io.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/xrl_fea_io.cc	2011-02-26 14:58:03.080172871 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_fea_io.cc,v 1.8 2009/01/05 18:30:49 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/fea/xrl_fea_node.cc xorp-1.6/fea/xrl_fea_node.cc
--- xorp-1.6.orig/fea/xrl_fea_node.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/xrl_fea_node.cc	2011-02-26 14:58:03.200578402 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_fea_node.cc,v 1.21 2009/01/05 18:30:49 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/fea/xrl_fea_target.cc xorp-1.6/fea/xrl_fea_target.cc
--- xorp-1.6.orig/fea/xrl_fea_target.cc	2009-01-05 13:30:49.000000000 -0500
+++ xorp-1.6/fea/xrl_fea_target.cc	2011-02-26 14:58:03.095856804 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_fea_target.cc,v 1.55 2009/01/05 18:30:49 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/fea/xrl_fib_client_manager.cc xorp-1.6/fea/xrl_fib_client_manager.cc
--- xorp-1.6.orig/fea/xrl_fib_client_manager.cc	2009-01-05 13:30:50.000000000 -0500
+++ xorp-1.6/fea/xrl_fib_client_manager.cc	2011-02-26 14:58:03.063894339 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_fib_client_manager.cc,v 1.7 2009/01/05 18:30:50 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/xrl_io_ip_manager.cc xorp-1.6/fea/xrl_io_ip_manager.cc
--- xorp-1.6.orig/fea/xrl_io_ip_manager.cc	2009-01-05 13:30:50.000000000 -0500
+++ xorp-1.6/fea/xrl_io_ip_manager.cc	2011-02-26 14:58:03.155908832 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_io_ip_manager.cc,v 1.8 2009/01/05 18:30:50 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/xrl_io_link_manager.cc xorp-1.6/fea/xrl_io_link_manager.cc
--- xorp-1.6.orig/fea/xrl_io_link_manager.cc	2009-01-05 13:30:50.000000000 -0500
+++ xorp-1.6/fea/xrl_io_link_manager.cc	2011-02-26 14:58:03.119877559 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_io_link_manager.cc,v 1.7 2009/01/05 18:30:50 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/xrl_io_tcpudp_manager.cc xorp-1.6/fea/xrl_io_tcpudp_manager.cc
--- xorp-1.6.orig/fea/xrl_io_tcpudp_manager.cc	2009-01-05 13:30:50.000000000 -0500
+++ xorp-1.6/fea/xrl_io_tcpudp_manager.cc	2011-02-26 14:58:03.112127939 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_io_tcpudp_manager.cc,v 1.8 2009/01/05 18:30:50 jtc Exp $"
 
 #include "fea_module.h"
 
diff -rupN xorp-1.6.orig/fea/xrl_mfea_node.cc xorp-1.6/fea/xrl_mfea_node.cc
--- xorp-1.6.orig/fea/xrl_mfea_node.cc	2009-01-05 13:30:50.000000000 -0500
+++ xorp-1.6/fea/xrl_mfea_node.cc	2011-02-26 14:58:03.128513240 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fea/xrl_mfea_node.cc,v 1.67 2009/01/05 18:30:50 jtc Exp $"
 
 #include "mfea_module.h"
 
diff -rupN xorp-1.6.orig/fib2mrib/fib2mrib_node.cc xorp-1.6/fib2mrib/fib2mrib_node.cc
--- xorp-1.6.orig/fib2mrib/fib2mrib_node.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fib2mrib/fib2mrib_node.cc	2011-02-26 14:58:02.703865560 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fib2mrib/fib2mrib_node.cc,v 1.41 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // Fib2mrib node implementation.
diff -rupN xorp-1.6.orig/fib2mrib/fib2mrib_varrw.cc xorp-1.6/fib2mrib/fib2mrib_varrw.cc
--- xorp-1.6.orig/fib2mrib/fib2mrib_varrw.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fib2mrib/fib2mrib_varrw.cc	2011-02-26 14:58:02.707882027 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fib2mrib/fib2mrib_varrw.cc,v 1.14 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fib2mrib_module.h"
 
diff -rupN xorp-1.6.orig/fib2mrib/xorp_fib2mrib.cc xorp-1.6/fib2mrib/xorp_fib2mrib.cc
--- xorp-1.6.orig/fib2mrib/xorp_fib2mrib.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fib2mrib/xorp_fib2mrib.cc	2011-02-26 14:58:02.691869245 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fib2mrib/xorp_fib2mrib.cc,v 1.16 2009/01/05 18:30:54 jtc Exp $"
 
 //
 // XORP Fib2mrib module implementation.
diff -rupN xorp-1.6.orig/fib2mrib/xrl_fib2mrib_node.cc xorp-1.6/fib2mrib/xrl_fib2mrib_node.cc
--- xorp-1.6.orig/fib2mrib/xrl_fib2mrib_node.cc	2009-01-05 13:30:54.000000000 -0500
+++ xorp-1.6/fib2mrib/xrl_fib2mrib_node.cc	2011-02-26 14:58:02.699886948 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/fib2mrib/xrl_fib2mrib_node.cc,v 1.44 2009/01/05 18:30:54 jtc Exp $"
 
 #include "fib2mrib_module.h"
 
diff -rupN xorp-1.6.orig/libcomm/comm_sock.c xorp-1.6/libcomm/comm_sock.c
--- xorp-1.6.orig/libcomm/comm_sock.c	2008-09-23 15:58:19.000000000 -0400
+++ xorp-1.6/libcomm/comm_sock.c	2011-02-26 14:58:04.008259939 -0500
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ident "$XORP: xorp/libcomm/comm_sock.c,v 1.48 2008/09/23 19:58:19 abittau Exp $"
 
 /*
  * COMM socket library lower `sock' level implementation.
diff -rupN xorp-1.6.orig/libcomm/comm_user.c xorp-1.6/libcomm/comm_user.c
--- xorp-1.6.orig/libcomm/comm_user.c	2008-11-09 05:18:22.000000000 -0500
+++ xorp-1.6/libcomm/comm_user.c	2011-02-26 14:58:04.000387749 -0500
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ident "$XORP: xorp/libcomm/comm_user.c,v 1.40 2008/11/09 10:18:22 pavlin Exp $"
 
 /*
  * COMM socket library higher `sock' level implementation.
diff -rupN xorp-1.6.orig/libcomm/test_comm.c xorp-1.6/libcomm/test_comm.c
--- xorp-1.6.orig/libcomm/test_comm.c	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libcomm/test_comm.c	2011-02-26 14:58:04.003888691 -0500
@@ -21,7 +21,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libcomm/test_comm.c,v 1.21 2009/01/05 18:30:55 jtc Exp $"
 
 
 /*
diff -rupN xorp-1.6.orig/libcomm/test_connect.cc xorp-1.6/libcomm/test_connect.cc
--- xorp-1.6.orig/libcomm/test_connect.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libcomm/test_connect.cc	2011-02-26 14:58:03.996324646 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libcomm/test_connect.cc,v 1.10 2009/01/05 18:30:55 jtc Exp $"
 
 #include "comm_module.h"
 
diff -rupN xorp-1.6.orig/libfeaclient/ifmgr_atoms.cc xorp-1.6/libfeaclient/ifmgr_atoms.cc
--- xorp-1.6.orig/libfeaclient/ifmgr_atoms.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/ifmgr_atoms.cc	2011-02-26 14:58:02.683888940 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/ifmgr_atoms.cc,v 1.30 2009/01/05 18:30:55 jtc Exp $"
 
 #include "ifmgr_atoms.hh"
 
diff -rupN xorp-1.6.orig/libfeaclient/ifmgr_cmd_queue.cc xorp-1.6/libfeaclient/ifmgr_cmd_queue.cc
--- xorp-1.6.orig/libfeaclient/ifmgr_cmd_queue.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/ifmgr_cmd_queue.cc	2011-02-26 14:58:02.672266420 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/ifmgr_cmd_queue.cc,v 1.26 2009/01/05 18:30:55 jtc Exp $"
 
 #include <algorithm>
 #include <iterator>
diff -rupN xorp-1.6.orig/libfeaclient/ifmgr_cmds.cc xorp-1.6/libfeaclient/ifmgr_cmds.cc
--- xorp-1.6.orig/libfeaclient/ifmgr_cmds.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/ifmgr_cmds.cc	2011-02-26 14:58:02.675880532 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/ifmgr_cmds.cc,v 1.32 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libxorp/c_format.hh"
 
diff -rupN xorp-1.6.orig/libfeaclient/ifmgr_xrl_mirror.cc xorp-1.6/libfeaclient/ifmgr_xrl_mirror.cc
--- xorp-1.6.orig/libfeaclient/ifmgr_xrl_mirror.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/ifmgr_xrl_mirror.cc	2011-02-26 14:58:02.668181538 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/ifmgr_xrl_mirror.cc,v 1.36 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libxorp/status_codes.h"
 #include "libxorp/eventloop.hh"
diff -rupN xorp-1.6.orig/libfeaclient/ifmgr_xrl_replicator.cc xorp-1.6/libfeaclient/ifmgr_xrl_replicator.cc
--- xorp-1.6.orig/libfeaclient/ifmgr_xrl_replicator.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/ifmgr_xrl_replicator.cc	2011-02-26 14:58:02.687864055 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/ifmgr_xrl_replicator.cc,v 1.19 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libfeaclient_module.h"
 
diff -rupN xorp-1.6.orig/libfeaclient/test_local_copy.cc xorp-1.6/libfeaclient/test_local_copy.cc
--- xorp-1.6.orig/libfeaclient/test_local_copy.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/test_local_copy.cc	2011-02-26 14:58:02.680348122 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/test_local_copy.cc,v 1.22 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libfeaclient_module.h"
 
diff -rupN xorp-1.6.orig/libfeaclient/test_remote_copy.cc xorp-1.6/libfeaclient/test_remote_copy.cc
--- xorp-1.6.orig/libfeaclient/test_remote_copy.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libfeaclient/test_remote_copy.cc	2011-02-26 14:58:02.687864055 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libfeaclient/test_remote_copy.cc,v 1.27 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libfeaclient_module.h"
 
diff -rupN xorp-1.6.orig/libproto/checksum.c xorp-1.6/libproto/checksum.c
--- xorp-1.6.orig/libproto/checksum.c	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/checksum.c	2011-02-26 14:58:04.231866944 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libproto/checksum.c,v 1.6 2009/01/05 18:30:55 jtc Exp $"
 
 
 /*
diff -rupN xorp-1.6.orig/libproto/packet.cc xorp-1.6/libproto/packet.cc
--- xorp-1.6.orig/libproto/packet.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/packet.cc	2011-02-26 14:58:04.235896888 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/packet.cc,v 1.16 2009/01/05 18:30:55 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/libproto/proto_node_cli.cc xorp-1.6/libproto/proto_node_cli.cc
--- xorp-1.6.orig/libproto/proto_node_cli.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/proto_node_cli.cc	2011-02-26 14:58:04.244628466 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/proto_node_cli.cc,v 1.13 2009/01/05 18:30:55 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/libproto/proto_state.cc xorp-1.6/libproto/proto_state.cc
--- xorp-1.6.orig/libproto/proto_state.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/proto_state.cc	2011-02-26 14:58:04.255865467 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/proto_state.cc,v 1.19 2009/01/05 18:30:55 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/libproto/proto_unit.cc xorp-1.6/libproto/proto_unit.cc
--- xorp-1.6.orig/libproto/proto_unit.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/proto_unit.cc	2011-02-26 14:58:04.239873846 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/proto_unit.cc,v 1.17 2009/01/05 18:30:55 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/libproto/spt.cc xorp-1.6/libproto/spt.cc
--- xorp-1.6.orig/libproto/spt.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/spt.cc	2011-02-26 14:58:04.251865666 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/spt.cc,v 1.13 2009/01/05 18:30:55 jtc Exp $"
 
 // XXX
 //		THIS FILE IS NOW OBSOLETE
diff -rupN xorp-1.6.orig/libproto/test_checksum.cc xorp-1.6/libproto/test_checksum.cc
--- xorp-1.6.orig/libproto/test_checksum.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/test_checksum.cc	2011-02-26 14:58:04.247883133 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/test_checksum.cc,v 1.9 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libproto_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libproto/test_config_node_id.cc xorp-1.6/libproto/test_config_node_id.cc
--- xorp-1.6.orig/libproto/test_config_node_id.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/test_config_node_id.cc	2011-02-26 14:58:04.231866944 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/test_config_node_id.cc,v 1.13 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libproto_module.h"
 
diff -rupN xorp-1.6.orig/libproto/test_packet.cc xorp-1.6/libproto/test_packet.cc
--- xorp-1.6.orig/libproto/test_packet.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/test_packet.cc	2011-02-26 14:58:04.239873846 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/test_packet.cc,v 1.8 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libproto_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libproto/test_spt.cc xorp-1.6/libproto/test_spt.cc
--- xorp-1.6.orig/libproto/test_spt.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libproto/test_spt.cc	2011-02-26 14:58:04.227873586 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libproto/test_spt.cc,v 1.22 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libproto_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/call_xrl.cc xorp-1.6/libxipc/call_xrl.cc
--- xorp-1.6.orig/libxipc/call_xrl.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/call_xrl.cc	2011-02-26 14:58:05.383866998 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/call_xrl.cc,v 1.41 2009/01/05 18:30:55 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/finder.cc xorp-1.6/libxipc/finder.cc
--- xorp-1.6.orig/libxipc/finder.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/finder.cc	2011-02-26 14:58:05.407956933 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder.cc,v 1.30 2009/01/05 18:30:55 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/libxipc/finder_client.cc xorp-1.6/libxipc/finder_client.cc
--- xorp-1.6.orig/libxipc/finder_client.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/finder_client.cc	2011-02-26 14:58:05.311873711 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_client.cc,v 1.43 2009/01/05 18:30:55 jtc Exp $"
 
 #include <functional>
 #include <algorithm>
diff -rupN xorp-1.6.orig/libxipc/finder_client_observer.cc xorp-1.6/libxipc/finder_client_observer.cc
--- xorp-1.6.orig/libxipc/finder_client_observer.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/finder_client_observer.cc	2011-02-26 14:58:05.227880203 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_client_observer.cc,v 1.14 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxipc/finder_client_xrl_target.cc xorp-1.6/libxipc/finder_client_xrl_target.cc
--- xorp-1.6.orig/libxipc/finder_client_xrl_target.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/finder_client_xrl_target.cc	2011-02-26 14:58:05.387885307 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_client_xrl_target.cc,v 1.14 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libxorp/status_codes.h"
 #include "finder_client_xrl_target.hh"
diff -rupN xorp-1.6.orig/libxipc/finder_main.cc xorp-1.6/libxipc/finder_main.cc
--- xorp-1.6.orig/libxipc/finder_main.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/finder_main.cc	2011-02-26 14:58:05.296658190 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_main.cc,v 1.29 2009/01/05 18:30:55 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/finder_messenger.cc xorp-1.6/libxipc/finder_messenger.cc
--- xorp-1.6.orig/libxipc/finder_messenger.cc	2009-01-05 13:30:55.000000000 -0500
+++ xorp-1.6/libxipc/finder_messenger.cc	2011-02-26 14:58:05.231876745 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_messenger.cc,v 1.17 2009/01/05 18:30:55 jtc Exp $"
 
 #include "finder_module.h"
 #include "finder_messenger.hh"
diff -rupN xorp-1.6.orig/libxipc/finder_msgs.cc xorp-1.6/libxipc/finder_msgs.cc
--- xorp-1.6.orig/libxipc/finder_msgs.cc	2011-02-26 14:56:52.143857497 -0500
+++ xorp-1.6/libxipc/finder_msgs.cc	2011-02-26 14:58:05.343867451 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_msgs.cc,v 1.13 2009/01/05 18:30:55 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "libxorp/c_format.hh"
diff -rupN xorp-1.6.orig/libxipc/finder_server.cc xorp-1.6/libxipc/finder_server.cc
--- xorp-1.6.orig/libxipc/finder_server.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/finder_server.cc	2011-02-26 14:58:05.223866916 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_server.cc,v 1.19 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 #include "finder_server.hh"
diff -rupN xorp-1.6.orig/libxipc/finder_tcp.cc xorp-1.6/libxipc/finder_tcp.cc
--- xorp-1.6.orig/libxipc/finder_tcp.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/finder_tcp.cc	2011-02-26 14:58:05.227880203 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_tcp.cc,v 1.39 2009/01/05 18:30:56 jtc Exp $"
 
 #include <functional>
 
diff -rupN xorp-1.6.orig/libxipc/finder_tcp_messenger.cc xorp-1.6/libxipc/finder_tcp_messenger.cc
--- xorp-1.6.orig/libxipc/finder_tcp_messenger.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/finder_tcp_messenger.cc	2011-02-26 14:58:05.379869290 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_tcp_messenger.cc,v 1.36 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/finder_xrl_queue.cc xorp-1.6/libxipc/finder_xrl_queue.cc
--- xorp-1.6.orig/libxipc/finder_xrl_queue.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/finder_xrl_queue.cc	2011-02-26 14:58:05.279865851 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_xrl_queue.cc,v 1.13 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/libxipc/finder_xrl_target.cc xorp-1.6/libxipc/finder_xrl_target.cc
--- xorp-1.6.orig/libxipc/finder_xrl_target.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/finder_xrl_target.cc	2011-02-26 14:58:05.339863050 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/finder_xrl_target.cc,v 1.33 2009/01/05 18:30:56 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/libxipc/header.cc xorp-1.6/libxipc/header.cc
--- xorp-1.6.orig/libxipc/header.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/header.cc	2011-02-26 14:58:05.248464701 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/header.cc,v 1.16 2009/01/05 18:30:56 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include <stdio.h>
diff -rupN xorp-1.6.orig/libxipc/hmac.cc xorp-1.6/libxipc/hmac.cc
--- xorp-1.6.orig/libxipc/hmac.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/hmac.cc	2011-02-26 14:58:05.268820675 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/hmac.cc,v 1.11 2009/01/05 18:30:56 jtc Exp $"
 
 #include "ipc_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/permits.cc xorp-1.6/libxipc/permits.cc
--- xorp-1.6.orig/libxipc/permits.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/permits.cc	2011-02-26 14:58:05.327870671 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/permits.cc,v 1.10 2009/01/05 18:30:56 jtc Exp $"
 
 #include "permits.hh"
 
diff -rupN xorp-1.6.orig/libxipc/sockutil.cc xorp-1.6/libxipc/sockutil.cc
--- xorp-1.6.orig/libxipc/sockutil.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/sockutil.cc	2011-02-26 14:58:05.255929682 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/sockutil.cc,v 1.31 2009/01/05 18:30:56 jtc Exp $"
 
 #include "ipc_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_finder.cc xorp-1.6/libxipc/test_finder.cc
--- xorp-1.6.orig/libxipc/test_finder.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_finder.cc	2011-02-26 14:58:05.376003668 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_finder.cc,v 1.28 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_finder_events.cc xorp-1.6/libxipc/test_finder_events.cc
--- xorp-1.6.orig/libxipc/test_finder_events.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_finder_events.cc	2011-02-26 14:58:05.376003668 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_finder_events.cc,v 1.33 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_finder_messenger.cc xorp-1.6/libxipc/test_finder_messenger.cc
--- xorp-1.6.orig/libxipc/test_finder_messenger.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_finder_messenger.cc	2011-02-26 14:58:05.331859456 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_finder_messenger.cc,v 1.24 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_finder_msgs.cc xorp-1.6/libxipc/test_finder_msgs.cc
--- xorp-1.6.orig/libxipc/test_finder_msgs.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_finder_msgs.cc	2011-02-26 14:58:05.360070447 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_finder_msgs.cc,v 1.16 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_finder_tcp.cc xorp-1.6/libxipc/test_finder_tcp.cc
--- xorp-1.6.orig/libxipc/test_finder_tcp.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_finder_tcp.cc	2011-02-26 14:58:05.347882603 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_finder_tcp.cc,v 1.29 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_finder_to.cc xorp-1.6/libxipc/test_finder_to.cc
--- xorp-1.6.orig/libxipc/test_finder_to.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_finder_to.cc	2011-02-26 14:58:05.244235671 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_finder_to.cc,v 1.18 2009/01/05 18:30:56 jtc Exp $"
 
 #include "finder_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_header.cc xorp-1.6/libxipc/test_header.cc
--- xorp-1.6.orig/libxipc/test_header.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_header.cc	2011-02-26 14:58:05.275859339 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_header.cc,v 1.13 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/test_inproc.cc xorp-1.6/libxipc/test_inproc.cc
--- xorp-1.6.orig/libxipc/test_inproc.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_inproc.cc	2011-02-26 14:58:05.403873555 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_inproc.cc,v 1.22 2009/01/05 18:30:56 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/libxipc/test_lemming.cc xorp-1.6/libxipc/test_lemming.cc
--- xorp-1.6.orig/libxipc/test_lemming.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_lemming.cc	2011-02-26 14:58:05.219861157 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_lemming.cc,v 1.24 2009/01/05 18:30:56 jtc Exp $"
 
 #include "ipc_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_receiver.cc xorp-1.6/libxipc/test_receiver.cc
--- xorp-1.6.orig/libxipc/test_receiver.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_receiver.cc	2011-02-26 14:58:05.291878277 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_receiver.cc,v 1.8 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/test_stcp.cc xorp-1.6/libxipc/test_stcp.cc
--- xorp-1.6.orig/libxipc/test_stcp.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_stcp.cc	2011-02-26 14:58:05.347882603 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_stcp.cc,v 1.27 2009/01/05 18:30:56 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/libxipc/test_stcppf.cc xorp-1.6/libxipc/test_stcppf.cc
--- xorp-1.6.orig/libxipc/test_stcppf.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_stcppf.cc	2011-02-26 14:58:05.351864111 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_stcppf.cc,v 1.16 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/test_sudp.cc xorp-1.6/libxipc/test_sudp.cc
--- xorp-1.6.orig/libxipc/test_sudp.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_sudp.cc	2011-02-26 14:58:05.283866112 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_sudp.cc,v 1.20 2009/01/05 18:30:56 jtc Exp $"
 
 #include <map>
 
diff -rupN xorp-1.6.orig/libxipc/test_xrl_args.cc xorp-1.6/libxipc/test_xrl_args.cc
--- xorp-1.6.orig/libxipc/test_xrl_args.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_args.cc	2011-02-26 14:58:05.304195156 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_args.cc,v 1.22 2009/01/05 18:30:56 jtc Exp $"
 
 // test_xrl_args: String Serialization Tests
 
diff -rupN xorp-1.6.orig/libxipc/test_xrl_atom.cc xorp-1.6/libxipc/test_xrl_atom.cc
--- xorp-1.6.orig/libxipc/test_xrl_atom.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_atom.cc	2011-02-26 14:58:05.368198380 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_atom.cc,v 1.20 2009/01/05 18:30:56 jtc Exp $"
 
 // test_xrl_atom: String Serialization Tests
 
diff -rupN xorp-1.6.orig/libxipc/test_xrl.cc xorp-1.6/libxipc/test_xrl.cc
--- xorp-1.6.orig/libxipc/test_xrl.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl.cc	2011-02-26 14:58:05.272048012 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl.cc,v 1.19 2009/01/05 18:30:56 jtc Exp $"
 
 // test_xrl: String Serialization Tests
 
diff -rupN xorp-1.6.orig/libxipc/test_xrl_error.cc xorp-1.6/libxipc/test_xrl_error.cc
--- xorp-1.6.orig/libxipc/test_xrl_error.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_error.cc	2011-02-26 14:58:05.339863050 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_error.cc,v 1.12 2009/01/05 18:30:56 jtc Exp $"
 
 #include <assert.h>
 #include <stdio.h>
diff -rupN xorp-1.6.orig/libxipc/test_xrl_parser.cc xorp-1.6/libxipc/test_xrl_parser.cc
--- xorp-1.6.orig/libxipc/test_xrl_parser.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_parser.cc	2011-02-26 14:58:05.327870671 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_parser.cc,v 1.15 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/test_xrl_receiver.cc xorp-1.6/libxipc/test_xrl_receiver.cc
--- xorp-1.6.orig/libxipc/test_xrl_receiver.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_receiver.cc	2011-02-26 14:58:05.244235671 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_receiver.cc,v 1.23 2009/01/05 18:30:56 jtc Exp $"
 
 //
 // Test XRLs receiver.
diff -rupN xorp-1.6.orig/libxipc/test_xrl_router.cc xorp-1.6/libxipc/test_xrl_router.cc
--- xorp-1.6.orig/libxipc/test_xrl_router.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_router.cc	2011-02-26 14:58:05.291878277 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_router.cc,v 1.22 2009/01/05 18:30:56 jtc Exp $"
 
 #include <stdlib.h>
 
diff -rupN xorp-1.6.orig/libxipc/test_xrl_sender.cc xorp-1.6/libxipc/test_xrl_sender.cc
--- xorp-1.6.orig/libxipc/test_xrl_sender.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/test_xrl_sender.cc	2011-02-26 14:58:05.320323002 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/test_xrl_sender.cc,v 1.35 2009/01/05 18:30:56 jtc Exp $"
 
 //
 // Test XRLs sender.
diff -rupN xorp-1.6.orig/libxipc/xrl_args.cc xorp-1.6/libxipc/xrl_args.cc
--- xorp-1.6.orig/libxipc/xrl_args.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_args.cc	2011-02-26 14:58:05.240047584 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_args.cc,v 1.33 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_atom.cc xorp-1.6/libxipc/xrl_atom.cc
--- xorp-1.6.orig/libxipc/xrl_atom.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_atom.cc	2011-02-26 14:58:05.300046570 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_atom.cc,v 1.47 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_atom_encoding.cc xorp-1.6/libxipc/xrl_atom_encoding.cc
--- xorp-1.6.orig/libxipc/xrl_atom_encoding.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_atom_encoding.cc	2011-02-26 14:58:05.279865851 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_atom_encoding.cc,v 1.21 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_atom_list.cc xorp-1.6/libxipc/xrl_atom_list.cc
--- xorp-1.6.orig/libxipc/xrl_atom_list.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_atom_list.cc	2011-02-26 14:58:05.392153829 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_atom_list.cc,v 1.17 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/libxipc/xrl.cc xorp-1.6/libxipc/xrl.cc
--- xorp-1.6.orig/libxipc/xrl.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl.cc	2011-02-26 14:58:05.364194447 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl.cc,v 1.32 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/libxipc/xrl_cmd_map.cc xorp-1.6/libxipc/xrl_cmd_map.cc
--- xorp-1.6.orig/libxipc/xrl_cmd_map.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_cmd_map.cc	2011-02-26 14:58:05.237015841 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_cmd_map.cc,v 1.20 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_dispatcher.cc xorp-1.6/libxipc/xrl_dispatcher.cc
--- xorp-1.6.orig/libxipc/xrl_dispatcher.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_dispatcher.cc	2011-02-26 14:58:05.251969131 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_dispatcher.cc,v 1.17 2009/01/05 18:30:56 jtc Exp $"
 
 #include "ipc_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_error.cc xorp-1.6/libxipc/xrl_error.cc
--- xorp-1.6.orig/libxipc/xrl_error.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_error.cc	2011-02-26 14:58:05.272048012 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_error.cc,v 1.18 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_parser.cc xorp-1.6/libxipc/xrl_parser.cc
--- xorp-1.6.orig/libxipc/xrl_parser.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_parser.cc	2011-02-26 14:58:05.315907660 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_parser.cc,v 1.18 2009/01/05 18:30:56 jtc Exp $"
 
 #include <stdio.h>
 
diff -rupN xorp-1.6.orig/libxipc/xrl_parser_input.cc xorp-1.6/libxipc/xrl_parser_input.cc
--- xorp-1.6.orig/libxipc/xrl_parser_input.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_parser_input.cc	2011-02-26 14:58:05.287989730 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_parser_input.cc,v 1.17 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/xrl_pf.cc xorp-1.6/libxipc/xrl_pf.cc
--- xorp-1.6.orig/libxipc/xrl_pf.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf.cc	2011-02-26 14:58:05.387885307 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf.cc,v 1.9 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_pf.hh"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_factory.cc xorp-1.6/libxipc/xrl_pf_factory.cc
--- xorp-1.6.orig/libxipc/xrl_pf_factory.cc	2011-02-26 14:56:52.299857632 -0500
+++ xorp-1.6/libxipc/xrl_pf_factory.cc	2011-02-26 14:58:05.335878263 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf_factory.cc,v 1.23 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_inproc.cc xorp-1.6/libxipc/xrl_pf_inproc.cc
--- xorp-1.6.orig/libxipc/xrl_pf_inproc.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf_inproc.cc	2011-02-26 14:58:05.324141887 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf_inproc.cc,v 1.36 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_kill.cc xorp-1.6/libxipc/xrl_pf_kill.cc
--- xorp-1.6.orig/libxipc/xrl_pf_kill.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf_kill.cc	2011-02-26 14:58:05.311873711 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf_kill.cc,v 1.15 2009/01/05 18:30:56 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_stcp.cc xorp-1.6/libxipc/xrl_pf_stcp.cc
--- xorp-1.6.orig/libxipc/xrl_pf_stcp.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf_stcp.cc	2011-02-26 14:58:05.259905916 -0500
@@ -21,7 +21,6 @@
 
 //#define DEBUG_LOGGING
 
-#ident "$XORP: xorp/libxipc/xrl_pf_stcp.cc,v 1.73 2009/01/05 18:30:56 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_stcp_ph.cc xorp-1.6/libxipc/xrl_pf_stcp_ph.cc
--- xorp-1.6.orig/libxipc/xrl_pf_stcp_ph.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf_stcp_ph.cc	2011-02-26 14:58:05.356717967 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf_stcp_ph.cc,v 1.22 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_sudp.cc xorp-1.6/libxipc/xrl_pf_sudp.cc
--- xorp-1.6.orig/libxipc/xrl_pf_sudp.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf_sudp.cc	2011-02-26 14:58:05.396987942 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf_sudp.cc,v 1.54 2009/01/05 18:30:56 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/libxipc/xrl_pf_unix.cc xorp-1.6/libxipc/xrl_pf_unix.cc
--- xorp-1.6.orig/libxipc/xrl_pf_unix.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_pf_unix.cc	2011-02-26 14:58:05.264157737 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_pf_unix.cc,v 1.5 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "xrl_pf_unix.hh"
diff -rupN xorp-1.6.orig/libxipc/xrl_router.cc xorp-1.6/libxipc/xrl_router.cc
--- xorp-1.6.orig/libxipc/xrl_router.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_router.cc	2011-02-26 14:58:05.399873066 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_router.cc,v 1.73 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/libxipc/xrl_std_router.cc xorp-1.6/libxipc/xrl_std_router.cc
--- xorp-1.6.orig/libxipc/xrl_std_router.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_std_router.cc	2011-02-26 14:58:05.251969131 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_std_router.cc,v 1.23 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 #include "xrl_std_router.hh"
diff -rupN xorp-1.6.orig/libxipc/xrl_tokens.cc xorp-1.6/libxipc/xrl_tokens.cc
--- xorp-1.6.orig/libxipc/xrl_tokens.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xrl_tokens.cc	2011-02-26 14:58:05.368198380 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xrl_tokens.cc,v 1.11 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_tokens.hh"
 
diff -rupN xorp-1.6.orig/libxipc/xuid.cc xorp-1.6/libxipc/xuid.cc
--- xorp-1.6.orig/libxipc/xuid.cc	2009-01-05 13:30:56.000000000 -0500
+++ xorp-1.6/libxipc/xuid.cc	2011-02-26 14:58:05.360070447 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxipc/xuid.cc,v 1.16 2009/01/05 18:30:56 jtc Exp $"
 
 #include "xrl_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/asyncio.cc xorp-1.6/libxorp/asyncio.cc
--- xorp-1.6.orig/libxorp/asyncio.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/asyncio.cc	2011-02-26 14:58:04.552427698 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/asyncio.cc,v 1.48 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/buffered_asyncio.cc xorp-1.6/libxorp/buffered_asyncio.cc
--- xorp-1.6.orig/libxorp/buffered_asyncio.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/buffered_asyncio.cc	2011-02-26 14:58:04.399921976 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/buffered_asyncio.cc,v 1.18 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "xorp.h"
diff -rupN xorp-1.6.orig/libxorp/callback.cc xorp-1.6/libxorp/callback.cc
--- xorp-1.6.orig/libxorp/callback.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/callback.cc	2011-02-26 14:58:04.528102029 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/callback.cc,v 1.15 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/c_format.cc xorp-1.6/libxorp/c_format.cc
--- xorp-1.6.orig/libxorp/c_format.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/c_format.cc	2011-02-26 14:58:04.440040882 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/c_format.cc,v 1.16 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxorp/debug.c xorp-1.6/libxorp/debug.c
--- xorp-1.6.orig/libxorp/debug.c	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/debug.c	2011-02-26 14:58:04.396839179 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/debug.c,v 1.16 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "libxorp/debug.h"
diff -rupN xorp-1.6.orig/libxorp/ether_compat.c xorp-1.6/libxorp/ether_compat.c
--- xorp-1.6.orig/libxorp/ether_compat.c	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/ether_compat.c	2011-02-26 14:58:04.555916218 -0500
@@ -21,7 +21,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/ether_compat.c,v 1.16 2009/01/05 18:30:57 jtc Exp $"
 
 /*
  * Part of this software is derived from the following file(s):
diff -rupN xorp-1.6.orig/libxorp/eventloop.cc xorp-1.6/libxorp/eventloop.cc
--- xorp-1.6.orig/libxorp/eventloop.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/eventloop.cc	2011-02-26 14:58:04.563863626 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/eventloop.cc,v 1.50 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/exceptions.cc xorp-1.6/libxorp/exceptions.cc
--- xorp-1.6.orig/libxorp/exceptions.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/exceptions.cc	2011-02-26 14:58:04.404122851 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/exceptions.cc,v 1.11 2009/01/05 18:30:57 jtc Exp $"
 
 #include <stdarg.h>
 #include <stdio.h>
diff -rupN xorp-1.6.orig/libxorp/getopt.c xorp-1.6/libxorp/getopt.c
--- xorp-1.6.orig/libxorp/getopt.c	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/getopt.c	2011-02-26 14:58:04.387848375 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/getopt.c,v 1.9 2009/01/05 18:30:57 jtc Exp $"
 
 /*
  * Part of this software is derived from the following file(s):
diff -rupN xorp-1.6.orig/libxorp/heap.cc xorp-1.6/libxorp/heap.cc
--- xorp-1.6.orig/libxorp/heap.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/heap.cc	2011-02-26 14:58:04.415913250 -0500
@@ -21,7 +21,6 @@
 // Portions of this code originally derived from:
 // 	FreeBSD dummynet code, (C) 2001 Luigi Rizzo.
 
-#ident "$XORP: xorp/libxorp/heap.cc,v 1.24 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxorp/inet_ntop.c xorp-1.6/libxorp/inet_ntop.c
--- xorp-1.6.orig/libxorp/inet_ntop.c	2008-10-01 17:52:45.000000000 -0400
+++ xorp-1.6/libxorp/inet_ntop.c	2011-02-26 14:58:04.503865872 -0500
@@ -16,7 +16,6 @@
  * SOFTWARE.
  */
 
-#ident "$XORP: xorp/libxorp/inet_ntop.c,v 1.7 2008/10/01 21:52:45 pavlin Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/inet_pton.c xorp-1.6/libxorp/inet_pton.c
--- xorp-1.6.orig/libxorp/inet_pton.c	2008-10-01 18:15:07.000000000 -0400
+++ xorp-1.6/libxorp/inet_pton.c	2011-02-26 14:58:04.492372204 -0500
@@ -16,7 +16,6 @@
  * SOFTWARE.
  */
 
-#ident "$XORP: xorp/libxorp/inet_pton.c,v 1.3 2008/10/01 22:15:07 pavlin Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/ipnet.cc xorp-1.6/libxorp/ipnet.cc
--- xorp-1.6.orig/libxorp/ipnet.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/ipnet.cc	2011-02-26 14:58:04.523852902 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/ipnet.cc,v 1.10 2009/01/05 18:30:57 jtc Exp $"
 
 #include "xorp.h"
 #include "ipnet.hh"
diff -rupN xorp-1.6.orig/libxorp/ipv4.cc xorp-1.6/libxorp/ipv4.cc
--- xorp-1.6.orig/libxorp/ipv4.cc	2009-01-05 13:30:57.000000000 -0500
+++ xorp-1.6/libxorp/ipv4.cc	2011-02-26 14:58:04.591903640 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/ipv4.cc,v 1.36 2009/01/05 18:30:57 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/ipv6.cc xorp-1.6/libxorp/ipv6.cc
--- xorp-1.6.orig/libxorp/ipv6.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/ipv6.cc	2011-02-26 14:58:04.408223937 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/ipv6.cc,v 1.36 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/ipvx.cc xorp-1.6/libxorp/ipvx.cc
--- xorp-1.6.orig/libxorp/ipvx.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/ipvx.cc	2011-02-26 14:58:04.448028993 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/ipvx.cc,v 1.37 2009/01/05 18:30:58 jtc Exp $"
 
 #include "xorp.h"
 #include "ipvx.hh"
diff -rupN xorp-1.6.orig/libxorp/mac.cc xorp-1.6/libxorp/mac.cc
--- xorp-1.6.orig/libxorp/mac.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/mac.cc	2011-02-26 14:58:04.567897560 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/mac.cc,v 1.32 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "libxorp/ether_compat.h" 
diff -rupN xorp-1.6.orig/libxorp/nexthop.cc xorp-1.6/libxorp/nexthop.cc
--- xorp-1.6.orig/libxorp/nexthop.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/nexthop.cc	2011-02-26 14:58:04.443860028 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/nexthop.cc,v 1.14 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/popen.cc xorp-1.6/libxorp/popen.cc
--- xorp-1.6.orig/libxorp/popen.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/popen.cc	2011-02-26 14:58:04.539917815 -0500
@@ -64,7 +64,6 @@
  * $FreeBSD: src/lib/libc/gen/popen.c,v 1.14 2000/01/27 23:06:19 jasone Exp $
  */
 
-#ident "$XORP: xorp/libxorp/popen.cc,v 1.25 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/profile.cc xorp-1.6/libxorp/profile.cc
--- xorp-1.6.orig/libxorp/profile.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/profile.cc	2011-02-26 14:58:04.519924377 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/profile.cc,v 1.17 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "xorp.h"
diff -rupN xorp-1.6.orig/libxorp/random.c xorp-1.6/libxorp/random.c
--- xorp-1.6.orig/libxorp/random.c	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/random.c	2011-02-26 14:58:04.467865201 -0500
@@ -21,7 +21,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/random.c,v 1.21 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/ref_ptr.cc xorp-1.6/libxorp/ref_ptr.cc
--- xorp-1.6.orig/libxorp/ref_ptr.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/ref_ptr.cc	2011-02-26 14:58:04.456575620 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/ref_ptr.cc,v 1.17 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/round_robin.cc xorp-1.6/libxorp/round_robin.cc
--- xorp-1.6.orig/libxorp/round_robin.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/round_robin.cc	2011-02-26 14:58:04.572343020 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/round_robin.cc,v 1.9 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxorp/run_command.cc xorp-1.6/libxorp/run_command.cc
--- xorp-1.6.orig/libxorp/run_command.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/run_command.cc	2011-02-26 14:58:04.463872236 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/run_command.cc,v 1.38 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/safe_callback_obj.cc xorp-1.6/libxorp/safe_callback_obj.cc
--- xorp-1.6.orig/libxorp/safe_callback_obj.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/safe_callback_obj.cc	2011-02-26 14:58:04.440040882 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/safe_callback_obj.cc,v 1.12 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/selector.cc xorp-1.6/libxorp/selector.cc
--- xorp-1.6.orig/libxorp/selector.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/selector.cc	2011-02-26 14:58:04.531867263 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/selector.cc,v 1.56 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/service.cc xorp-1.6/libxorp/service.cc
--- xorp-1.6.orig/libxorp/service.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/service.cc	2011-02-26 14:58:04.519924377 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/service.cc,v 1.14 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "xorp.h"
diff -rupN xorp-1.6.orig/libxorp/strlcpy.c xorp-1.6/libxorp/strlcpy.c
--- xorp-1.6.orig/libxorp/strlcpy.c	2007-04-21 21:57:09.000000000 -0400
+++ xorp-1.6/libxorp/strlcpy.c	2011-02-26 14:58:04.451892099 -0500
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ident "$XORP: xorp/libxorp/strlcpy.c,v 1.1 2007/04/22 01:57:09 pavlin Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/strptime.c xorp-1.6/libxorp/strptime.c
--- xorp-1.6.orig/libxorp/strptime.c	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/strptime.c	2011-02-26 14:58:04.495910151 -0500
@@ -21,7 +21,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/strptime.c,v 1.20 2009/01/05 18:30:58 jtc Exp $"
 
 
 /*
diff -rupN xorp-1.6.orig/libxorp/task.cc xorp-1.6/libxorp/task.cc
--- xorp-1.6.orig/libxorp/task.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/task.cc	2011-02-26 14:58:04.499847893 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/task.cc,v 1.13 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "xorp.h"
diff -rupN xorp-1.6.orig/libxorp/test_asyncio.cc xorp-1.6/libxorp/test_asyncio.cc
--- xorp-1.6.orig/libxorp/test_asyncio.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_asyncio.cc	2011-02-26 14:58:04.591903640 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_asyncio.cc,v 1.24 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_callback.cc xorp-1.6/libxorp/test_callback.cc
--- xorp-1.6.orig/libxorp/test_callback.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_callback.cc	2011-02-26 14:58:04.379864677 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_callback.cc,v 1.13 2009/01/05 18:30:58 jtc Exp $"
 
 //
 // Callback test program
diff -rupN xorp-1.6.orig/libxorp/test_config_param.cc xorp-1.6/libxorp/test_config_param.cc
--- xorp-1.6.orig/libxorp/test_config_param.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_config_param.cc	2011-02-26 14:58:04.419846637 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_config_param.cc,v 1.16 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_heap.cc xorp-1.6/libxorp/test_heap.cc
--- xorp-1.6.orig/libxorp/test_heap.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_heap.cc	2011-02-26 14:58:04.483873276 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_heap.cc,v 1.13 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipnet.cc xorp-1.6/libxorp/test_ipnet.cc
--- xorp-1.6.orig/libxorp/test_ipnet.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipnet.cc	2011-02-26 14:58:04.536734728 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipnet.cc,v 1.21 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipv4.cc xorp-1.6/libxorp/test_ipv4.cc
--- xorp-1.6.orig/libxorp/test_ipv4.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipv4.cc	2011-02-26 14:58:04.379864677 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipv4.cc,v 1.34 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipv4net.cc xorp-1.6/libxorp/test_ipv4net.cc
--- xorp-1.6.orig/libxorp/test_ipv4net.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipv4net.cc	2011-02-26 14:58:04.475860997 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipv4net.cc,v 1.27 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipv6.cc xorp-1.6/libxorp/test_ipv6.cc
--- xorp-1.6.orig/libxorp/test_ipv6.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipv6.cc	2011-02-26 14:58:04.480022343 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipv6.cc,v 1.34 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipv6net.cc xorp-1.6/libxorp/test_ipv6net.cc
--- xorp-1.6.orig/libxorp/test_ipv6net.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipv6net.cc	2011-02-26 14:58:04.435849078 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipv6net.cc,v 1.22 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipvx.cc xorp-1.6/libxorp/test_ipvx.cc
--- xorp-1.6.orig/libxorp/test_ipvx.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipvx.cc	2011-02-26 14:58:04.584298189 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipvx.cc,v 1.35 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ipvxnet.cc xorp-1.6/libxorp/test_ipvxnet.cc
--- xorp-1.6.orig/libxorp/test_ipvxnet.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ipvxnet.cc	2011-02-26 14:58:04.431928643 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ipvxnet.cc,v 1.26 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_mac.cc xorp-1.6/libxorp/test_mac.cc
--- xorp-1.6.orig/libxorp/test_mac.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_mac.cc	2011-02-26 14:58:04.371869446 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_mac.cc,v 1.24 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_observers.cc xorp-1.6/libxorp/test_observers.cc
--- xorp-1.6.orig/libxorp/test_observers.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_observers.cc	2011-02-26 14:58:04.419846637 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_observers.cc,v 1.15 2009/01/05 18:30:58 jtc Exp $"
 
 //
 // Test program to the Observer classes for TimerList and SelectorList
diff -rupN xorp-1.6.orig/libxorp/test_profile.cc xorp-1.6/libxorp/test_profile.cc
--- xorp-1.6.orig/libxorp/test_profile.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_profile.cc	2011-02-26 14:58:04.572343020 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_profile.cc,v 1.12 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "xorp.h"
diff -rupN xorp-1.6.orig/libxorp/test_ref_ptr.cc xorp-1.6/libxorp/test_ref_ptr.cc
--- xorp-1.6.orig/libxorp/test_ref_ptr.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ref_ptr.cc	2011-02-26 14:58:04.451892099 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ref_ptr.cc,v 1.15 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_ref_trie.cc xorp-1.6/libxorp/test_ref_trie.cc
--- xorp-1.6.orig/libxorp/test_ref_trie.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_ref_trie.cc	2011-02-26 14:58:04.459896291 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_ref_trie.cc,v 1.19 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_run_command.cc xorp-1.6/libxorp/test_run_command.cc
--- xorp-1.6.orig/libxorp/test_run_command.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_run_command.cc	2011-02-26 14:58:04.548125325 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_run_command.cc,v 1.23 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_sched.cc xorp-1.6/libxorp/test_sched.cc
--- xorp-1.6.orig/libxorp/test_sched.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_sched.cc	2011-02-26 14:58:04.423875910 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_sched.cc,v 1.7 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxorp/test_service.cc xorp-1.6/libxorp/test_service.cc
--- xorp-1.6.orig/libxorp/test_service.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_service.cc	2011-02-26 14:58:04.503865872 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_service.cc,v 1.18 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_task.cc xorp-1.6/libxorp/test_task.cc
--- xorp-1.6.orig/libxorp/test_task.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_task.cc	2011-02-26 14:58:04.563863626 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_task.cc,v 1.13 2009/01/05 18:30:58 jtc Exp $"
 
 //
 // Demo program to test tasks and event loops.
diff -rupN xorp-1.6.orig/libxorp/test_test_main.cc xorp-1.6/libxorp/test_test_main.cc
--- xorp-1.6.orig/libxorp/test_test_main.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_test_main.cc	2011-02-26 14:58:04.528102029 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_test_main.cc,v 1.18 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_timer.cc xorp-1.6/libxorp/test_timer.cc
--- xorp-1.6.orig/libxorp/test_timer.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_timer.cc	2011-02-26 14:58:04.555916218 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_timer.cc,v 1.20 2009/01/05 18:30:58 jtc Exp $"
 
 //
 // demo program to test timers and event loops (and show
diff -rupN xorp-1.6.orig/libxorp/test_time_slice.cc xorp-1.6/libxorp/test_time_slice.cc
--- xorp-1.6.orig/libxorp/test_time_slice.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_time_slice.cc	2011-02-26 14:58:04.399921976 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_time_slice.cc,v 1.15 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_timeval.cc xorp-1.6/libxorp/test_timeval.cc
--- xorp-1.6.orig/libxorp/test_timeval.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_timeval.cc	2011-02-26 14:58:04.411872037 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_timeval.cc,v 1.16 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_trie.cc xorp-1.6/libxorp/test_trie.cc
--- xorp-1.6.orig/libxorp/test_trie.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_trie.cc	2011-02-26 14:58:04.471885421 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_trie.cc,v 1.16 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/test_types.cc xorp-1.6/libxorp/test_types.cc
--- xorp-1.6.orig/libxorp/test_types.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_types.cc	2011-02-26 14:58:04.391932584 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_types.cc,v 1.10 2009/01/05 18:30:58 jtc Exp $"
 
 #include <iostream>
 
diff -rupN xorp-1.6.orig/libxorp/test_utils.cc xorp-1.6/libxorp/test_utils.cc
--- xorp-1.6.orig/libxorp/test_utils.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_utils.cc	2011-02-26 14:58:04.543860561 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_utils.cc,v 1.11 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/libxorp/test_vif.cc xorp-1.6/libxorp/test_vif.cc
--- xorp-1.6.orig/libxorp/test_vif.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/test_vif.cc	2011-02-26 14:58:04.515901638 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/test_vif.cc,v 1.23 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp_module.h"
 
diff -rupN xorp-1.6.orig/libxorp/timer.cc xorp-1.6/libxorp/timer.cc
--- xorp-1.6.orig/libxorp/timer.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/timer.cc	2011-02-26 14:58:04.488191470 -0500
@@ -25,7 +25,6 @@
 //
 // Copyright (c) 1999-2000 Massachusetts Institute of Technology
 
-#ident "$XORP: xorp/libxorp/timer.cc,v 1.52 2009/01/05 18:30:58 jtc Exp $"
 
 
 #include "libxorp_module.h"
diff -rupN xorp-1.6.orig/libxorp/time_slice.cc xorp-1.6/libxorp/time_slice.cc
--- xorp-1.6.orig/libxorp/time_slice.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/time_slice.cc	2011-02-26 14:58:04.576427120 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/time_slice.cc,v 1.13 2009/01/05 18:30:58 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/libxorp/token.cc xorp-1.6/libxorp/token.cc
--- xorp-1.6.orig/libxorp/token.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/token.cc	2011-02-26 14:58:04.512900792 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/token.cc,v 1.16 2009/01/05 18:30:58 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/libxorp/transaction.cc xorp-1.6/libxorp/transaction.cc
--- xorp-1.6.orig/libxorp/transaction.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/transaction.cc	2011-02-26 14:58:04.507862818 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/transaction.cc,v 1.14 2009/01/05 18:30:58 jtc Exp $"
 
 #include <assert.h>
 
diff -rupN xorp-1.6.orig/libxorp/utility.c xorp-1.6/libxorp/utility.c
--- xorp-1.6.orig/libxorp/utility.c	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/utility.c	2011-02-26 14:58:04.492372204 -0500
@@ -20,7 +20,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/utility.c,v 1.14 2009/01/05 18:30:58 jtc Exp $"
 
 
 /*
diff -rupN xorp-1.6.orig/libxorp/utils.cc xorp-1.6/libxorp/utils.cc
--- xorp-1.6.orig/libxorp/utils.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/utils.cc	2011-02-26 14:58:04.559860048 -0500
@@ -19,7 +19,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/utils.cc,v 1.15 2009/01/05 18:30:58 jtc Exp $"
 
 #include "xorp.h"
 #include "c_format.hh"
diff -rupN xorp-1.6.orig/libxorp/vif.cc xorp-1.6/libxorp/vif.cc
--- xorp-1.6.orig/libxorp/vif.cc	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/vif.cc	2011-02-26 14:58:04.588109189 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/libxorp/vif.cc,v 1.28 2009/01/05 18:30:58 jtc Exp $"
 
 #include <functional>
 #include <string>
diff -rupN xorp-1.6.orig/libxorp/win_io.c xorp-1.6/libxorp/win_io.c
--- xorp-1.6.orig/libxorp/win_io.c	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/win_io.c	2011-02-26 14:58:04.408223937 -0500
@@ -21,7 +21,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/win_io.c,v 1.14 2009/01/05 18:30:58 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/libxorp/xlog.c xorp-1.6/libxorp/xlog.c
--- xorp-1.6.orig/libxorp/xlog.c	2009-01-05 13:30:58.000000000 -0500
+++ xorp-1.6/libxorp/xlog.c	2011-02-26 14:58:04.387848375 -0500
@@ -21,7 +21,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/libxorp/xlog.c,v 1.32 2009/01/05 18:30:58 jtc Exp $"
 
 /*
  * Message logging utility.
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_1657_bgp4pathattrtable.cc xorp-1.6/mibs/bgp4_mib_1657_bgp4pathattrtable.cc
--- xorp-1.6.orig/mibs/bgp4_mib_1657_bgp4pathattrtable.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_1657_bgp4pathattrtable.cc	2011-02-26 14:58:05.496598481 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_1657_bgp4pathattrtable.cc,v 1.28 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <stack>
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_1657_bgpidentifier.cc xorp-1.6/mibs/bgp4_mib_1657_bgpidentifier.cc
--- xorp-1.6.orig/mibs/bgp4_mib_1657_bgpidentifier.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_1657_bgpidentifier.cc	2011-02-26 14:58:05.476010255 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_1657_bgpidentifier.cc,v 1.12 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_1657_bgplocalas.cc xorp-1.6/mibs/bgp4_mib_1657_bgplocalas.cc
--- xorp-1.6.orig/mibs/bgp4_mib_1657_bgplocalas.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_1657_bgplocalas.cc	2011-02-26 14:58:05.472799112 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_1657_bgplocalas.cc,v 1.13 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_1657_bgppeertable.cc xorp-1.6/mibs/bgp4_mib_1657_bgppeertable.cc
--- xorp-1.6.orig/mibs/bgp4_mib_1657_bgppeertable.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_1657_bgppeertable.cc	2011-02-26 14:58:05.463865206 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_1657_bgppeertable.cc,v 1.25 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_1657_bgpversion.cc xorp-1.6/mibs/bgp4_mib_1657_bgpversion.cc
--- xorp-1.6.orig/mibs/bgp4_mib_1657_bgpversion.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_1657_bgpversion.cc	2011-02-26 14:58:05.467879878 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_1657_bgpversion.cc,v 1.19 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_1657.cc xorp-1.6/mibs/bgp4_mib_1657.cc
--- xorp-1.6.orig/mibs/bgp4_mib_1657.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_1657.cc	2011-02-26 14:58:05.492141318 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_1657.cc,v 1.24 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/bgp4_mib_xrl_target.cc xorp-1.6/mibs/bgp4_mib_xrl_target.cc
--- xorp-1.6.orig/mibs/bgp4_mib_xrl_target.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/bgp4_mib_xrl_target.cc	2011-02-26 14:58:05.460360465 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/bgp4_mib_xrl_target.cc,v 1.15 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/ospf_mib_1850.cc xorp-1.6/mibs/ospf_mib_1850.cc
--- xorp-1.6.orig/mibs/ospf_mib_1850.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/ospf_mib_1850.cc	2011-02-26 14:58:05.476010255 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/ospf_mib_1850.cc,v 1.12 2009/01/05 18:31:00 jtc Exp $"
 
 /*
  * Note: this file originally auto-generated by mib2c using
diff -rupN xorp-1.6.orig/mibs/test_xorpevents.cc xorp-1.6/mibs/test_xorpevents.cc
--- xorp-1.6.orig/mibs/test_xorpevents.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/test_xorpevents.cc	2011-02-26 14:58:05.488008631 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/test_xorpevents.cc,v 1.23 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <set>
diff -rupN xorp-1.6.orig/mibs/xorpevents.cc xorp-1.6/mibs/xorpevents.cc
--- xorp-1.6.orig/mibs/xorpevents.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/xorpevents.cc	2011-02-26 14:58:05.483866137 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/xorpevents.cc,v 1.22 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/xorp_if_mib_module.cc xorp-1.6/mibs/xorp_if_mib_module.cc
--- xorp-1.6.orig/mibs/xorp_if_mib_module.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/xorp_if_mib_module.cc	2011-02-26 14:58:05.483866137 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/xorp_if_mib_module.cc,v 1.16 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mibs/xorp_if_mib_xrl_target.cc xorp-1.6/mibs/xorp_if_mib_xrl_target.cc
--- xorp-1.6.orig/mibs/xorp_if_mib_xrl_target.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mibs/xorp_if_mib_xrl_target.cc	2011-02-26 14:58:05.479867207 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mibs/xorp_if_mib_xrl_target.cc,v 1.14 2009/01/05 18:31:00 jtc Exp $"
 
 
 #include <net-snmp/net-snmp-config.h>
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_config.cc xorp-1.6/mld6igmp/mld6igmp_config.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_config.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_config.cc	2011-02-26 14:58:05.444000168 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_config.cc,v 1.23 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_group_record.cc xorp-1.6/mld6igmp/mld6igmp_group_record.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_group_record.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_group_record.cc	2011-02-26 14:58:05.432172480 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_group_record.cc,v 1.35 2009/01/05 18:31:00 jtc Exp $"
 
 //
 // Multicast group record information used by
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_node.cc xorp-1.6/mld6igmp/mld6igmp_node.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_node.cc	2011-02-26 14:57:00.624110422 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_node.cc	2011-02-26 14:58:05.420043347 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_node.cc,v 1.61 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_node_cli.cc xorp-1.6/mld6igmp/mld6igmp_node_cli.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_node_cli.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_node_cli.cc	2011-02-26 14:58:05.423865064 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_node_cli.cc,v 1.35 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_proto.cc xorp-1.6/mld6igmp/mld6igmp_proto.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_proto.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_proto.cc	2011-02-26 14:58:05.412332201 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_proto.cc,v 1.51 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_source_record.cc xorp-1.6/mld6igmp/mld6igmp_source_record.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_source_record.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_source_record.cc	2011-02-26 14:58:05.460360465 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_source_record.cc,v 1.16 2009/01/05 18:31:00 jtc Exp $"
 
 //
 // Multicast source record information used by IGMPv3 (RFC 3376) and
diff -rupN xorp-1.6.orig/mld6igmp/mld6igmp_vif.cc xorp-1.6/mld6igmp/mld6igmp_vif.cc
--- xorp-1.6.orig/mld6igmp/mld6igmp_vif.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/mld6igmp_vif.cc	2011-02-26 14:58:05.455874666 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/mld6igmp_vif.cc,v 1.92 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/xorp_igmp.cc xorp-1.6/mld6igmp/xorp_igmp.cc
--- xorp-1.6.orig/mld6igmp/xorp_igmp.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/xorp_igmp.cc	2011-02-26 14:58:05.423865064 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/xorp_igmp.cc,v 1.18 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/xorp_mld.cc xorp-1.6/mld6igmp/xorp_mld.cc
--- xorp-1.6.orig/mld6igmp/xorp_mld.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/xorp_mld.cc	2011-02-26 14:58:05.447843409 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/xorp_mld.cc,v 1.19 2009/01/05 18:31:00 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mld6igmp/xrl_mld6igmp_node.cc xorp-1.6/mld6igmp/xrl_mld6igmp_node.cc
--- xorp-1.6.orig/mld6igmp/xrl_mld6igmp_node.cc	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mld6igmp/xrl_mld6igmp_node.cc	2011-02-26 14:58:05.439862608 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mld6igmp/xrl_mld6igmp_node.cc,v 1.71 2009/01/05 18:31:00 jtc Exp $"
 
 #include "mld6igmp_module.h"
 
diff -rupN xorp-1.6.orig/mrt/buffer.c xorp-1.6/mrt/buffer.c
--- xorp-1.6.orig/mrt/buffer.c	2009-01-05 13:31:00.000000000 -0500
+++ xorp-1.6/mrt/buffer.c	2011-02-26 14:58:03.815850016 -0500
@@ -19,7 +19,6 @@
  * http://xorp.net
  */
 
-#ident "$XORP: xorp/mrt/buffer.c,v 1.10 2009/01/05 18:31:00 jtc Exp $"
 
 
 /*
diff -rupN xorp-1.6.orig/mrt/mifset.cc xorp-1.6/mrt/mifset.cc
--- xorp-1.6.orig/mrt/mifset.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/mrt/mifset.cc	2011-02-26 14:58:03.815850016 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mrt/mifset.cc,v 1.12 2009/01/05 18:31:01 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mrt/mrib_table.cc xorp-1.6/mrt/mrib_table.cc
--- xorp-1.6.orig/mrt/mrib_table.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/mrt/mrib_table.cc	2011-02-26 14:58:03.828806547 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mrt/mrib_table.cc,v 1.25 2009/01/05 18:31:01 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mrt/test_mrib.cc xorp-1.6/mrt/test_mrib.cc
--- xorp-1.6.orig/mrt/test_mrib.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/mrt/test_mrib.cc	2011-02-26 14:58:03.819872801 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mrt/test_mrib.cc,v 1.13 2009/01/05 18:31:01 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/mrt/test_mrt.cc xorp-1.6/mrt/test_mrt.cc
--- xorp-1.6.orig/mrt/test_mrt.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/mrt/test_mrt.cc	2011-02-26 14:58:03.823879640 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/mrt/test_mrt.cc,v 1.15 2009/01/05 18:31:01 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/ospf/area_router.cc xorp-1.6/ospf/area_router.cc
--- xorp-1.6.orig/ospf/area_router.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/area_router.cc	2011-02-26 14:58:03.695929384 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/area_router.cc,v 1.305 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/auth.cc xorp-1.6/ospf/auth.cc
--- xorp-1.6.orig/ospf/auth.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/auth.cc	2011-02-26 14:58:03.760343190 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/auth.cc,v 1.21 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/external.cc xorp-1.6/ospf/external.cc
--- xorp-1.6.orig/ospf/external.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/external.cc	2011-02-26 14:58:03.783867075 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/external.cc,v 1.41 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/fletcher_checksum.cc xorp-1.6/ospf/fletcher_checksum.cc
--- xorp-1.6.orig/ospf/fletcher_checksum.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/fletcher_checksum.cc	2011-02-26 14:58:03.783867075 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/fletcher_checksum.cc,v 1.10 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/lsa.cc xorp-1.6/ospf/lsa.cc
--- xorp-1.6.orig/ospf/lsa.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/lsa.cc	2011-02-26 14:58:03.799988950 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/lsa.cc,v 1.112 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/ospf.cc xorp-1.6/ospf/ospf.cc
--- xorp-1.6.orig/ospf/ospf.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/ospf.cc	2011-02-26 14:58:03.739880647 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/ospf.cc,v 1.102 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/packet.cc xorp-1.6/ospf/packet.cc
--- xorp-1.6.orig/ospf/packet.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/packet.cc	2011-02-26 14:58:03.728092864 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/packet.cc,v 1.50 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/peer.cc xorp-1.6/ospf/peer.cc
--- xorp-1.6.orig/ospf/peer.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/peer.cc	2011-02-26 14:58:03.711927919 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/peer.cc,v 1.309 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/peer_manager.cc xorp-1.6/ospf/peer_manager.cc
--- xorp-1.6.orig/ospf/peer_manager.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/peer_manager.cc	2011-02-26 14:58:03.776399405 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/peer_manager.cc,v 1.161 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/policy_varrw.cc xorp-1.6/ospf/policy_varrw.cc
--- xorp-1.6.orig/ospf/policy_varrw.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/policy_varrw.cc	2011-02-26 14:58:03.755877015 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/policy_varrw.cc,v 1.20 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/routing_table.cc xorp-1.6/ospf/routing_table.cc
--- xorp-1.6.orig/ospf/routing_table.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/routing_table.cc	2011-02-26 14:58:03.771878815 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/routing_table.cc,v 1.73 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/test_build_lsa.cc xorp-1.6/ospf/test_build_lsa.cc
--- xorp-1.6.orig/ospf/test_build_lsa.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_build_lsa.cc	2011-02-26 14:58:03.792712716 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_build_lsa.cc,v 1.25 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/test_build_lsa_main.cc xorp-1.6/ospf/test_build_lsa_main.cc
--- xorp-1.6.orig/ospf/test_build_lsa_main.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_build_lsa_main.cc	2011-02-26 14:58:03.715972949 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_build_lsa_main.cc,v 1.11 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/test_checksum.cc xorp-1.6/ospf/test_checksum.cc
--- xorp-1.6.orig/ospf/test_checksum.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_checksum.cc	2011-02-26 14:58:03.764453722 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_checksum.cc,v 1.13 2009/01/05 18:31:01 jtc Exp $"
 
 #define DEBUG_LOGGING
 #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/test_packet.cc xorp-1.6/ospf/test_packet.cc
--- xorp-1.6.orig/ospf/test_packet.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_packet.cc	2011-02-26 14:58:03.748287408 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_packet.cc,v 1.60 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/test_peering.cc xorp-1.6/ospf/test_peering.cc
--- xorp-1.6.orig/ospf/test_peering.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_peering.cc	2011-02-26 14:58:03.752198965 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_peering.cc,v 1.61 2009/01/05 18:31:01 jtc Exp $"
 
 #define DEBUG_LOGGING
 #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/test_routing.cc xorp-1.6/ospf/test_routing.cc
--- xorp-1.6.orig/ospf/test_routing.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_routing.cc	2011-02-26 14:58:03.736456097 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_routing.cc,v 1.31 2009/01/05 18:31:01 jtc Exp $"
 
 #define DEBUG_LOGGING
 #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/test_routing_database.cc xorp-1.6/ospf/test_routing_database.cc
--- xorp-1.6.orig/ospf/test_routing_database.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_routing_database.cc	2011-02-26 14:58:03.807957165 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_routing_database.cc,v 1.7 2009/01/05 18:31:01 jtc Exp $"
 
 #define DEBUG_LOGGING
 #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/test_routing_interactive.cc xorp-1.6/ospf/test_routing_interactive.cc
--- xorp-1.6.orig/ospf/test_routing_interactive.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_routing_interactive.cc	2011-02-26 14:58:03.767880632 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_routing_interactive.cc,v 1.13 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/test_routing_table.cc xorp-1.6/ospf/test_routing_table.cc
--- xorp-1.6.orig/ospf/test_routing_table.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/test_routing_table.cc	2011-02-26 14:58:03.679906507 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/test_routing_table.cc,v 1.15 2009/01/05 18:31:01 jtc Exp $"
 
 #define DEBUG_LOGGING
 #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/tools/clear_database.cc xorp-1.6/ospf/tools/clear_database.cc
--- xorp-1.6.orig/ospf/tools/clear_database.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/ospf/tools/clear_database.cc	2011-02-26 14:58:03.671879215 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/tools/clear_database.cc,v 1.5 2009/01/05 18:31:02 jtc Exp $"
 
 // Print information about OSPF neighbours
 
diff -rupN xorp-1.6.orig/ospf/tools/print_lsas.cc xorp-1.6/ospf/tools/print_lsas.cc
--- xorp-1.6.orig/ospf/tools/print_lsas.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/ospf/tools/print_lsas.cc	2011-02-26 14:58:03.675861685 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/tools/print_lsas.cc,v 1.26 2009/01/05 18:31:02 jtc Exp $"
 
 // Get LSAs (in raw binary) from OSPF and print them.
 
diff -rupN xorp-1.6.orig/ospf/tools/print_neighbours.cc xorp-1.6/ospf/tools/print_neighbours.cc
--- xorp-1.6.orig/ospf/tools/print_neighbours.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/ospf/tools/print_neighbours.cc	2011-02-26 14:58:03.671879215 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/tools/print_neighbours.cc,v 1.13 2009/01/05 18:31:02 jtc Exp $"
 
 // Print information about OSPF neighbours
 
diff -rupN xorp-1.6.orig/ospf/vlink.cc xorp-1.6/ospf/vlink.cc
--- xorp-1.6.orig/ospf/vlink.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/vlink.cc	2011-02-26 14:58:03.787861215 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/vlink.cc,v 1.18 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/xorp_ospfv2.cc xorp-1.6/ospf/xorp_ospfv2.cc
--- xorp-1.6.orig/ospf/xorp_ospfv2.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/xorp_ospfv2.cc	2011-02-26 14:58:03.755877015 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/xorp_ospfv2.cc,v 1.18 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/xorp_ospfv3.cc xorp-1.6/ospf/xorp_ospfv3.cc
--- xorp-1.6.orig/ospf/xorp_ospfv3.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/xorp_ospfv3.cc	2011-02-26 14:58:03.715972949 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/xorp_ospfv3.cc,v 1.19 2009/01/05 18:31:01 jtc Exp $"
 
 #include "ospf_module.h"
 
diff -rupN xorp-1.6.orig/ospf/xrl_io.cc xorp-1.6/ospf/xrl_io.cc
--- xorp-1.6.orig/ospf/xrl_io.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/xrl_io.cc	2011-02-26 14:58:03.803901666 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/xrl_io.cc,v 1.54 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/ospf/xrl_target.cc xorp-1.6/ospf/xrl_target.cc
--- xorp-1.6.orig/ospf/xrl_target.cc	2009-01-05 13:31:01.000000000 -0500
+++ xorp-1.6/ospf/xrl_target.cc	2011-02-26 14:58:03.723878142 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/ospf/xrl_target.cc,v 1.65 2009/01/05 18:31:01 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/pim/pim_bsr.cc xorp-1.6/pim/pim_bsr.cc
--- xorp-1.6.orig/pim/pim_bsr.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_bsr.cc	2011-02-26 14:58:02.548579983 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_bsr.cc,v 1.58 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_config.cc xorp-1.6/pim/pim_config.cc
--- xorp-1.6.orig/pim/pim_config.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_config.cc	2011-02-26 14:58:02.511964489 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_config.cc,v 1.58 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_mfc.cc xorp-1.6/pim/pim_mfc.cc
--- xorp-1.6.orig/pim/pim_mfc.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mfc.cc	2011-02-26 14:58:02.507884239 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mfc.cc,v 1.39 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Forwarding Cache handling
diff -rupN xorp-1.6.orig/pim/pim_mre_assert.cc xorp-1.6/pim/pim_mre_assert.cc
--- xorp-1.6.orig/pim/pim_mre_assert.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_assert.cc	2011-02-26 14:58:02.535885347 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_assert.cc,v 1.43 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry Assert handling
diff -rupN xorp-1.6.orig/pim/pim_mre.cc xorp-1.6/pim/pim_mre.cc
--- xorp-1.6.orig/pim/pim_mre.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre.cc	2011-02-26 14:58:02.539879233 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre.cc,v 1.45 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry handling
diff -rupN xorp-1.6.orig/pim/pim_mre_data.cc xorp-1.6/pim/pim_mre_data.cc
--- xorp-1.6.orig/pim/pim_mre_data.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_data.cc	2011-02-26 14:58:02.580685441 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_data.cc,v 1.25 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry data handling
diff -rupN xorp-1.6.orig/pim/pim_mre_join_prune.cc xorp-1.6/pim/pim_mre_join_prune.cc
--- xorp-1.6.orig/pim/pim_mre_join_prune.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_join_prune.cc	2011-02-26 14:58:02.567860135 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_join_prune.cc,v 1.45 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry Join/Prune handling
diff -rupN xorp-1.6.orig/pim/pim_mre_register.cc xorp-1.6/pim/pim_mre_register.cc
--- xorp-1.6.orig/pim/pim_mre_register.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_register.cc	2011-02-26 14:58:02.611880306 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_register.cc,v 1.30 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry Register handling
diff -rupN xorp-1.6.orig/pim/pim_mre_rpf.cc xorp-1.6/pim/pim_mre_rpf.cc
--- xorp-1.6.orig/pim/pim_mre_rpf.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_rpf.cc	2011-02-26 14:58:02.620403475 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_rpf.cc,v 1.49 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry RPF handling
diff -rupN xorp-1.6.orig/pim/pim_mre_task.cc xorp-1.6/pim/pim_mre_task.cc
--- xorp-1.6.orig/pim/pim_mre_task.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_task.cc	2011-02-26 14:58:02.587863491 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_task.cc,v 1.21 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry task
diff -rupN xorp-1.6.orig/pim/pim_mre_track_state.cc xorp-1.6/pim/pim_mre_track_state.cc
--- xorp-1.6.orig/pim/pim_mre_track_state.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mre_track_state.cc	2011-02-26 14:58:02.479936423 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mre_track_state.cc,v 1.47 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Entry state tracking
diff -rupN xorp-1.6.orig/pim/pim_mrib_table.cc xorp-1.6/pim/pim_mrib_table.cc
--- xorp-1.6.orig/pim/pim_mrib_table.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mrib_table.cc	2011-02-26 14:58:02.515848069 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mrib_table.cc,v 1.18 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Information Base Table implementation.
diff -rupN xorp-1.6.orig/pim/pim_mrt.cc xorp-1.6/pim/pim_mrt.cc
--- xorp-1.6.orig/pim/pim_mrt.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mrt.cc	2011-02-26 14:58:02.463867365 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mrt.cc,v 1.17 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Table implementation.
diff -rupN xorp-1.6.orig/pim/pim_mrt_mfc.cc xorp-1.6/pim/pim_mrt_mfc.cc
--- xorp-1.6.orig/pim/pim_mrt_mfc.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mrt_mfc.cc	2011-02-26 14:58:02.571865239 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mrt_mfc.cc,v 1.41 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Table MFC-related implementation.
diff -rupN xorp-1.6.orig/pim/pim_mrt_task.cc xorp-1.6/pim/pim_mrt_task.cc
--- xorp-1.6.orig/pim/pim_mrt_task.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_mrt_task.cc	2011-02-26 14:58:02.592478516 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_mrt_task.cc,v 1.28 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM Multicast Routing Table task-related implementation.
diff -rupN xorp-1.6.orig/pim/pim_nbr.cc xorp-1.6/pim/pim_nbr.cc
--- xorp-1.6.orig/pim/pim_nbr.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_nbr.cc	2011-02-26 14:58:02.520006905 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_nbr.cc,v 1.24 2009/01/05 18:31:02 jtc Exp $"
 
 //
 // PIM neigbor routers handling
diff -rupN xorp-1.6.orig/pim/pim_node.cc xorp-1.6/pim/pim_node.cc
--- xorp-1.6.orig/pim/pim_node.cc	2011-02-26 14:57:00.699854861 -0500
+++ xorp-1.6/pim/pim_node.cc	2011-02-26 14:58:02.528203404 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_node.cc,v 1.92 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_node_cli.cc xorp-1.6/pim/pim_node_cli.cc
--- xorp-1.6.orig/pim/pim_node_cli.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_node_cli.cc	2011-02-26 14:58:02.460665876 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_node_cli.cc,v 1.47 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_assert.cc xorp-1.6/pim/pim_proto_assert.cc
--- xorp-1.6.orig/pim/pim_proto_assert.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_proto_assert.cc	2011-02-26 14:58:02.631868175 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_assert.cc,v 1.33 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_bootstrap.cc xorp-1.6/pim/pim_proto_bootstrap.cc
--- xorp-1.6.orig/pim/pim_proto_bootstrap.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_proto_bootstrap.cc	2011-02-26 14:58:02.580685441 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_bootstrap.cc,v 1.29 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_cand_rp_adv.cc xorp-1.6/pim/pim_proto_cand_rp_adv.cc
--- xorp-1.6.orig/pim/pim_proto_cand_rp_adv.cc	2009-01-05 13:31:02.000000000 -0500
+++ xorp-1.6/pim/pim_proto_cand_rp_adv.cc	2011-02-26 14:58:02.479936423 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_cand_rp_adv.cc,v 1.26 2009/01/05 18:31:02 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_graft_ack.cc xorp-1.6/pim/pim_proto_graft_ack.cc
--- xorp-1.6.orig/pim/pim_proto_graft_ack.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_graft_ack.cc	2011-02-26 14:58:02.599885411 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_graft_ack.cc,v 1.11 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_graft.cc xorp-1.6/pim/pim_proto_graft.cc
--- xorp-1.6.orig/pim/pim_proto_graft.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_graft.cc	2011-02-26 14:58:02.555975089 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_graft.cc,v 1.16 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_hello.cc xorp-1.6/pim/pim_proto_hello.cc
--- xorp-1.6.orig/pim/pim_proto_hello.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_hello.cc	2011-02-26 14:58:02.575866391 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_hello.cc,v 1.31 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_join_prune.cc xorp-1.6/pim/pim_proto_join_prune.cc
--- xorp-1.6.orig/pim/pim_proto_join_prune.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_join_prune.cc	2011-02-26 14:58:02.504135416 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_join_prune.cc,v 1.20 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_join_prune_message.cc xorp-1.6/pim/pim_proto_join_prune_message.cc
--- xorp-1.6.orig/pim/pim_proto_join_prune_message.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_join_prune_message.cc	2011-02-26 14:58:02.555975089 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_join_prune_message.cc,v 1.33 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_register.cc xorp-1.6/pim/pim_proto_register.cc
--- xorp-1.6.orig/pim/pim_proto_register.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_register.cc	2011-02-26 14:58:02.615932052 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_register.cc,v 1.42 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_proto_register_stop.cc xorp-1.6/pim/pim_proto_register_stop.cc
--- xorp-1.6.orig/pim/pim_proto_register_stop.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_proto_register_stop.cc	2011-02-26 14:58:02.627865246 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_proto_register_stop.cc,v 1.21 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_rp.cc xorp-1.6/pim/pim_rp.cc
--- xorp-1.6.orig/pim/pim_rp.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_rp.cc	2011-02-26 14:58:02.599885411 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_rp.cc,v 1.23 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_scope_zone_table.cc xorp-1.6/pim/pim_scope_zone_table.cc
--- xorp-1.6.orig/pim/pim_scope_zone_table.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_scope_zone_table.cc	2011-02-26 14:58:02.468307025 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_scope_zone_table.cc,v 1.18 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/pim_vif.cc xorp-1.6/pim/pim_vif.cc
--- xorp-1.6.orig/pim/pim_vif.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/pim_vif.cc	2011-02-26 14:58:02.608538121 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/pim_vif.cc,v 1.74 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/xorp_pimsm4.cc xorp-1.6/pim/xorp_pimsm4.cc
--- xorp-1.6.orig/pim/xorp_pimsm4.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/xorp_pimsm4.cc	2011-02-26 14:58:02.631868175 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/xorp_pimsm4.cc,v 1.18 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/xorp_pimsm6.cc xorp-1.6/pim/xorp_pimsm6.cc
--- xorp-1.6.orig/pim/xorp_pimsm6.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/pim/xorp_pimsm6.cc	2011-02-26 14:58:02.623882634 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/xorp_pimsm6.cc,v 1.19 2009/01/05 18:31:03 jtc Exp $"
 
 
 //
diff -rupN xorp-1.6.orig/pim/xrl_pim_node.cc xorp-1.6/pim/xrl_pim_node.cc
--- xorp-1.6.orig/pim/xrl_pim_node.cc	2008-10-02 17:57:56.000000000 -0400
+++ xorp-1.6/pim/xrl_pim_node.cc	2011-02-26 14:58:02.499860893 -0500
@@ -16,7 +16,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/pim/xrl_pim_node.cc,v 1.105 2008/10/02 21:57:56 bms Exp $"
 
 #include "pim_module.h"
 
diff -rupN xorp-1.6.orig/policy/backend/iv_exec.cc xorp-1.6/policy/backend/iv_exec.cc
--- xorp-1.6.orig/policy/backend/iv_exec.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/iv_exec.cc	2011-02-26 14:58:03.955866558 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/iv_exec.cc,v 1.29 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/backend/policy_filter.cc xorp-1.6/policy/backend/policy_filter.cc
--- xorp-1.6.orig/policy/backend/policy_filter.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/policy_filter.cc	2011-02-26 14:58:03.952639762 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/policy_filter.cc,v 1.20 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/backend/policy_filters.cc xorp-1.6/policy/backend/policy_filters.cc
--- xorp-1.6.orig/policy/backend/policy_filters.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/policy_filters.cc	2011-02-26 14:58:03.947964301 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/policy_filters.cc,v 1.14 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "policy_filters.hh"
diff -rupN xorp-1.6.orig/policy/backend/policy_profiler.cc xorp-1.6/policy/backend/policy_profiler.cc
--- xorp-1.6.orig/policy/backend/policy_profiler.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/policy_profiler.cc	2011-02-26 14:58:03.947964301 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/policy_profiler.cc,v 1.8 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/backend/policy_redist_map.cc xorp-1.6/policy/backend/policy_redist_map.cc
--- xorp-1.6.orig/policy/backend/policy_redist_map.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/policy_redist_map.cc	2011-02-26 14:58:03.928490439 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/policy_redist_map.cc,v 1.11 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/backend/policytags.cc xorp-1.6/policy/backend/policytags.cc
--- xorp-1.6.orig/policy/backend/policytags.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/policytags.cc	2011-02-26 14:58:03.943977905 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/policytags.cc,v 1.17 2009/01/05 18:31:06 jtc Exp $"
 
 #include <sstream>
 
diff -rupN xorp-1.6.orig/policy/backend/set_manager.cc xorp-1.6/policy/backend/set_manager.cc
--- xorp-1.6.orig/policy/backend/set_manager.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/set_manager.cc	2011-02-26 14:58:03.939931745 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/set_manager.cc,v 1.12 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/backend/single_varrw.cc xorp-1.6/policy/backend/single_varrw.cc
--- xorp-1.6.orig/policy/backend/single_varrw.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/single_varrw.cc	2011-02-26 14:58:03.939931745 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/single_varrw.cc,v 1.21 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/backend/version_filter.cc xorp-1.6/policy/backend/version_filter.cc
--- xorp-1.6.orig/policy/backend/version_filter.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/version_filter.cc	2011-02-26 14:58:03.935907309 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/version_filter.cc,v 1.11 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/backend/version_filters.cc xorp-1.6/policy/backend/version_filters.cc
--- xorp-1.6.orig/policy/backend/version_filters.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/backend/version_filters.cc	2011-02-26 14:58:03.931877310 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/backend/version_filters.cc,v 1.9 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/backend/yacc.yy_policy_backend_parser.cc xorp-1.6/policy/backend/yacc.yy_policy_backend_parser.cc
--- xorp-1.6.orig/policy/backend/yacc.yy_policy_backend_parser.cc	2008-11-21 17:29:26.000000000 -0500
+++ xorp-1.6/policy/backend/yacc.yy_policy_backend_parser.cc	2011-02-26 14:58:03.935907309 -0500
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #ifndef lint
-#ident "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $"
 #endif
 #define YYBYACC 1
 #define YYMAJOR 1
diff -rupN xorp-1.6.orig/policy/code.cc xorp-1.6/policy/code.cc
--- xorp-1.6.orig/policy/code.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/code.cc	2011-02-26 14:58:03.919846150 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/code.cc,v 1.14 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/code_generator.cc xorp-1.6/policy/code_generator.cc
--- xorp-1.6.orig/policy/code_generator.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/code_generator.cc	2011-02-26 14:58:03.843877173 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/code_generator.cc,v 1.21 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/code_list.cc xorp-1.6/policy/code_list.cc
--- xorp-1.6.orig/policy/code_list.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/code_list.cc	2011-02-26 14:58:03.875937086 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/code_list.cc,v 1.15 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/common/dispatcher.cc xorp-1.6/policy/common/dispatcher.cc
--- xorp-1.6.orig/policy/common/dispatcher.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/dispatcher.cc	2011-02-26 14:58:03.891987523 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/dispatcher.cc,v 1.19 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/element_base.cc xorp-1.6/policy/common/element_base.cc
--- xorp-1.6.orig/policy/common/element_base.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/element_base.cc	2011-02-26 14:58:03.912475418 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/element_base.cc,v 1.6 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/common/element.cc xorp-1.6/policy/common/element.cc
--- xorp-1.6.orig/policy/common/element.cc	2011-02-26 14:56:52.375855084 -0500
+++ xorp-1.6/policy/common/element.cc	2011-02-26 14:58:03.912475418 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/element.cc,v 1.18 2009/01/05 18:31:06 jtc Exp $"
 
 #include "element.hh"
 #include "elem_null.hh"
diff -rupN xorp-1.6.orig/policy/common/element_factory.cc xorp-1.6/policy/common/element_factory.cc
--- xorp-1.6.orig/policy/common/element_factory.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/element_factory.cc	2011-02-26 14:58:03.904298855 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/element_factory.cc,v 1.13 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/common/elem_set.cc xorp-1.6/policy/common/elem_set.cc
--- xorp-1.6.orig/policy/common/elem_set.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/elem_set.cc	2011-02-26 14:58:03.888044840 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/elem_set.cc,v 1.22 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/filter.cc xorp-1.6/policy/common/filter.cc
--- xorp-1.6.orig/policy/common/filter.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/filter.cc	2011-02-26 14:58:03.883949796 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/filter.cc,v 1.9 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/operator.cc xorp-1.6/policy/common/operator.cc
--- xorp-1.6.orig/policy/common/operator.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/operator.cc	2011-02-26 14:58:03.891987523 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/operator.cc,v 1.9 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/policy_utils.cc xorp-1.6/policy/common/policy_utils.cc
--- xorp-1.6.orig/policy/common/policy_utils.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/policy_utils.cc	2011-02-26 14:58:03.895964995 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/policy_utils.cc,v 1.16 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/register_elements.cc xorp-1.6/policy/common/register_elements.cc
--- xorp-1.6.orig/policy/common/register_elements.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/register_elements.cc	2011-02-26 14:58:03.895964995 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/register_elements.cc,v 1.17 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/register_operations.cc xorp-1.6/policy/common/register_operations.cc
--- xorp-1.6.orig/policy/common/register_operations.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/register_operations.cc	2011-02-26 14:58:03.900522753 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/register_operations.cc,v 1.31 2009/01/05 18:31:06 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/common/varrw.cc xorp-1.6/policy/common/varrw.cc
--- xorp-1.6.orig/policy/common/varrw.cc	2009-01-05 13:31:06.000000000 -0500
+++ xorp-1.6/policy/common/varrw.cc	2011-02-26 14:58:03.907907818 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/common/varrw.cc,v 1.14 2009/01/05 18:31:06 jtc Exp $"
 
 #include "policy/policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/configuration.cc xorp-1.6/policy/configuration.cc
--- xorp-1.6.orig/policy/configuration.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/configuration.cc	2011-02-26 14:58:03.843877173 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/configuration.cc,v 1.32 2009/01/05 18:31:03 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "policy_module.h"
diff -rupN xorp-1.6.orig/policy/dependency.cc xorp-1.6/policy/dependency.cc
--- xorp-1.6.orig/policy/dependency.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/dependency.cc	2011-02-26 14:58:03.919846150 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/dependency.cc,v 1.4 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/export_code_generator.cc xorp-1.6/policy/export_code_generator.cc
--- xorp-1.6.orig/policy/export_code_generator.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/export_code_generator.cc	2011-02-26 14:58:03.851955822 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/export_code_generator.cc,v 1.17 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/filter_manager.cc xorp-1.6/policy/filter_manager.cc
--- xorp-1.6.orig/policy/filter_manager.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/filter_manager.cc	2011-02-26 14:58:03.863878018 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/filter_manager.cc,v 1.24 2009/01/05 18:31:03 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/policy/parser.cc xorp-1.6/policy/parser.cc
--- xorp-1.6.orig/policy/parser.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/parser.cc	2011-02-26 14:58:03.832101534 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/parser.cc,v 1.11 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/policy_list.cc xorp-1.6/policy/policy_list.cc
--- xorp-1.6.orig/policy/policy_list.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/policy_list.cc	2011-02-26 14:58:03.984306165 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/policy_list.cc,v 1.18 2009/01/05 18:31:03 jtc Exp $"
 
 #include <sstream>
 
diff -rupN xorp-1.6.orig/policy/policy_map.cc xorp-1.6/policy/policy_map.cc
--- xorp-1.6.orig/policy/policy_map.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/policy_map.cc	2011-02-26 14:58:03.991910461 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/policy_map.cc,v 1.16 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/policy_statement.cc xorp-1.6/policy/policy_statement.cc
--- xorp-1.6.orig/policy/policy_statement.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/policy_statement.cc	2011-02-26 14:58:03.856185229 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/policy_statement.cc,v 1.19 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/policy_target.cc xorp-1.6/policy/policy_target.cc
--- xorp-1.6.orig/policy/policy_target.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/policy_target.cc	2011-02-26 14:58:03.856185229 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/policy_target.cc,v 1.24 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/process_watch.cc xorp-1.6/policy/process_watch.cc
--- xorp-1.6.orig/policy/process_watch.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/process_watch.cc	2011-02-26 14:58:03.959866799 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/process_watch.cc,v 1.16 2009/01/05 18:31:03 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/policy/protocol_map.cc xorp-1.6/policy/protocol_map.cc
--- xorp-1.6.orig/policy/protocol_map.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/protocol_map.cc	2011-02-26 14:58:03.879867321 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/protocol_map.cc,v 1.8 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/semantic_varrw.cc xorp-1.6/policy/semantic_varrw.cc
--- xorp-1.6.orig/policy/semantic_varrw.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/semantic_varrw.cc	2011-02-26 14:58:03.991910461 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/semantic_varrw.cc,v 1.15 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/set_map.cc xorp-1.6/policy/set_map.cc
--- xorp-1.6.orig/policy/set_map.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/set_map.cc	2011-02-26 14:58:03.868262407 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/set_map.cc,v 1.17 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/source_match_code_generator.cc xorp-1.6/policy/source_match_code_generator.cc
--- xorp-1.6.orig/policy/source_match_code_generator.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/source_match_code_generator.cc	2011-02-26 14:58:03.915923004 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/source_match_code_generator.cc,v 1.21 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/term.cc xorp-1.6/policy/term.cc
--- xorp-1.6.orig/policy/term.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/term.cc	2011-02-26 14:58:03.860047507 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/term.cc,v 1.27 2009/01/05 18:31:03 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/policy/test/compilepolicy.cc xorp-1.6/policy/test/compilepolicy.cc
--- xorp-1.6.orig/policy/test/compilepolicy.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/policy/test/compilepolicy.cc	2011-02-26 14:58:03.963862575 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test/compilepolicy.cc,v 1.17 2009/01/05 18:31:07 jtc Exp $"
 
 /*
  * EXIT CODES:
diff -rupN xorp-1.6.orig/policy/test/execpolicy.cc xorp-1.6/policy/test/execpolicy.cc
--- xorp-1.6.orig/policy/test/execpolicy.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/policy/test/execpolicy.cc	2011-02-26 14:58:03.979899802 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test/execpolicy.cc,v 1.13 2009/01/05 18:31:07 jtc Exp $"
 
 /*
  * EXIT CODES:
diff -rupN xorp-1.6.orig/policy/test/file_varrw.cc xorp-1.6/policy/test/file_varrw.cc
--- xorp-1.6.orig/policy/test/file_varrw.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/policy/test/file_varrw.cc	2011-02-26 14:58:03.971865164 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test/file_varrw.cc,v 1.19 2009/01/05 18:31:07 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/test/filter_manager_fake.cc xorp-1.6/policy/test/filter_manager_fake.cc
--- xorp-1.6.orig/policy/test/filter_manager_fake.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/policy/test/filter_manager_fake.cc	2011-02-26 14:58:03.967873546 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test/filter_manager_fake.cc,v 1.10 2009/01/05 18:31:07 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/test/policybench.cc xorp-1.6/policy/test/policybench.cc
--- xorp-1.6.orig/policy/test/policybench.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/policy/test/policybench.cc	2011-02-26 14:58:03.971865164 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test/policybench.cc,v 1.13 2009/01/05 18:31:07 jtc Exp $"
 
 #include "policy/policy_module.h"
 #include "policy/common/policy_utils.hh"
diff -rupN xorp-1.6.orig/policy/test/process_watch_fake.cc xorp-1.6/policy/test/process_watch_fake.cc
--- xorp-1.6.orig/policy/test/process_watch_fake.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/policy/test/process_watch_fake.cc	2011-02-26 14:58:03.976713823 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test/process_watch_fake.cc,v 1.10 2009/01/05 18:31:07 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/policy/test/yacc.yy_compile_policy.cc xorp-1.6/policy/test/yacc.yy_compile_policy.cc
--- xorp-1.6.orig/policy/test/yacc.yy_compile_policy.cc	2008-11-21 17:29:27.000000000 -0500
+++ xorp-1.6/policy/test/yacc.yy_compile_policy.cc	2011-02-26 14:58:03.963862575 -0500
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #ifndef lint
-#ident "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $"
 #endif
 #define YYBYACC 1
 #define YYMAJOR 1
diff -rupN xorp-1.6.orig/policy/test_varrw.cc xorp-1.6/policy/test_varrw.cc
--- xorp-1.6.orig/policy/test_varrw.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/test_varrw.cc	2011-02-26 14:58:03.924278724 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/test_varrw.cc,v 1.4 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/var_map.cc xorp-1.6/policy/var_map.cc
--- xorp-1.6.orig/policy/var_map.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/var_map.cc	2011-02-26 14:58:03.836068416 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/var_map.cc,v 1.17 2009/01/05 18:31:03 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/policy/visitor_dep.cc xorp-1.6/policy/visitor_dep.cc
--- xorp-1.6.orig/policy/visitor_dep.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/visitor_dep.cc	2011-02-26 14:58:03.979899802 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/visitor_dep.cc,v 1.4 2009/01/05 18:31:03 jtc Exp $"
 
 #include <vector>
 
diff -rupN xorp-1.6.orig/policy/visitor_printer.cc xorp-1.6/policy/visitor_printer.cc
--- xorp-1.6.orig/policy/visitor_printer.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/visitor_printer.cc	2011-02-26 14:58:03.871985317 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/visitor_printer.cc,v 1.15 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/visitor_semantic.cc xorp-1.6/policy/visitor_semantic.cc
--- xorp-1.6.orig/policy/visitor_semantic.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/visitor_semantic.cc	2011-02-26 14:58:03.879867321 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/visitor_semantic.cc,v 1.24 2009/01/05 18:31:03 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/policy/visitor_test.cc xorp-1.6/policy/visitor_test.cc
--- xorp-1.6.orig/policy/visitor_test.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/visitor_test.cc	2011-02-26 14:58:03.988437560 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/visitor_test.cc,v 1.6 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/xorp_policy.cc xorp-1.6/policy/xorp_policy.cc
--- xorp-1.6.orig/policy/xorp_policy.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/xorp_policy.cc	2011-02-26 14:58:03.848254406 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/xorp_policy.cc,v 1.13 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/policy/xrl_target.cc xorp-1.6/policy/xrl_target.cc
--- xorp-1.6.orig/policy/xrl_target.cc	2009-01-05 13:31:03.000000000 -0500
+++ xorp-1.6/policy/xrl_target.cc	2011-02-26 14:58:03.871985317 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/policy/xrl_target.cc,v 1.21 2009/01/05 18:31:03 jtc Exp $"
 
 #include "policy_module.h"
 
diff -rupN xorp-1.6.orig/policy/yacc.yy_policy_parser.cc xorp-1.6/policy/yacc.yy_policy_parser.cc
--- xorp-1.6.orig/policy/yacc.yy_policy_parser.cc	2008-11-24 13:51:24.000000000 -0500
+++ xorp-1.6/policy/yacc.yy_policy_parser.cc	2011-02-26 14:58:03.840094861 -0500
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #ifndef lint
-#ident "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $"
 #endif
 #define YYBYACC 1
 #define YYMAJOR 1
diff -rupN xorp-1.6.orig/rib/add_route.cc xorp-1.6/rib/add_route.cc
--- xorp-1.6.orig/rib/add_route.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/add_route.cc	2011-02-26 14:58:04.287879123 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/add_route.cc,v 1.13 2009/01/05 18:31:07 jtc Exp $"
 
 // Add routes to the RIB.
 
diff -rupN xorp-1.6.orig/rib/dummy_register_server.cc xorp-1.6/rib/dummy_register_server.cc
--- xorp-1.6.orig/rib/dummy_register_server.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/dummy_register_server.cc	2011-02-26 14:58:04.296211547 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/dummy_register_server.cc,v 1.18 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/main_rib.cc xorp-1.6/rib/main_rib.cc
--- xorp-1.6.orig/rib/main_rib.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/main_rib.cc	2011-02-26 14:58:04.311865985 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/main_rib.cc,v 1.33 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/main_routemap.cc xorp-1.6/rib/main_routemap.cc
--- xorp-1.6.orig/rib/main_routemap.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/main_routemap.cc	2011-02-26 14:58:04.255865467 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/main_routemap.cc,v 1.13 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/parser.cc xorp-1.6/rib/parser.cc
--- xorp-1.6.orig/rib/parser.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/parser.cc	2011-02-26 14:58:04.264100309 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/parser.cc,v 1.22 2009/01/05 18:31:07 jtc Exp $"
 
 #include <stdexcept>
 
diff -rupN xorp-1.6.orig/rib/profile_vars.cc xorp-1.6/rib/profile_vars.cc
--- xorp-1.6.orig/rib/profile_vars.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/profile_vars.cc	2011-02-26 14:58:04.284527452 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/profile_vars.cc,v 1.9 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/protocol.cc xorp-1.6/rib/protocol.cc
--- xorp-1.6.orig/rib/protocol.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/protocol.cc	2011-02-26 14:58:04.311865985 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/protocol.cc,v 1.14 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/redist_xrl.cc xorp-1.6/rib/redist_xrl.cc
--- xorp-1.6.orig/rib/redist_xrl.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/redist_xrl.cc	2011-02-26 14:58:04.332341307 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/redist_xrl.cc,v 1.36 2009/01/05 18:31:07 jtc Exp $"
 
 #include <list>
 #include <string>
diff -rupN xorp-1.6.orig/rib/register_server.cc xorp-1.6/rib/register_server.cc
--- xorp-1.6.orig/rib/register_server.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/register_server.cc	2011-02-26 14:58:04.292014541 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/register_server.cc,v 1.24 2009/01/05 18:31:07 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rib/rib.cc xorp-1.6/rib/rib.cc
--- xorp-1.6.orig/rib/rib.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rib.cc	2011-02-26 14:58:04.356447758 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rib.cc,v 1.75 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rib_manager.cc xorp-1.6/rib/rib_manager.cc
--- xorp-1.6.orig/rib/rib_manager.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rib_manager.cc	2011-02-26 14:58:04.359860856 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rib_manager.cc,v 1.57 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rib_varrw.cc xorp-1.6/rib/rib_varrw.cc
--- xorp-1.6.orig/rib/rib_varrw.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rib_varrw.cc	2011-02-26 14:58:04.280316523 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rib_varrw.cc,v 1.17 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/rib/route.cc xorp-1.6/rib/route.cc
--- xorp-1.6.orig/rib/route.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/route.cc	2011-02-26 14:58:04.363936145 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/route.cc,v 1.13 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/routemap.cc xorp-1.6/rib/routemap.cc
--- xorp-1.6.orig/rib/routemap.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/routemap.cc	2011-02-26 14:58:04.339900182 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/routemap.cc,v 1.16 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_base.cc xorp-1.6/rib/rt_tab_base.cc
--- xorp-1.6.orig/rib/rt_tab_base.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_base.cc	2011-02-26 14:58:04.336016668 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_base.cc,v 1.16 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_deletion.cc xorp-1.6/rib/rt_tab_deletion.cc
--- xorp-1.6.orig/rib/rt_tab_deletion.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_deletion.cc	2011-02-26 14:58:04.363936145 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_deletion.cc,v 1.16 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_expect.cc xorp-1.6/rib/rt_tab_expect.cc
--- xorp-1.6.orig/rib/rt_tab_expect.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_expect.cc	2011-02-26 14:58:04.339900182 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_expect.cc,v 1.19 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_extint.cc xorp-1.6/rib/rt_tab_extint.cc
--- xorp-1.6.orig/rib/rt_tab_extint.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_extint.cc	2011-02-26 14:58:04.303880161 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_extint.cc,v 1.38 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_log.cc xorp-1.6/rib/rt_tab_log.cc
--- xorp-1.6.orig/rib/rt_tab_log.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_log.cc	2011-02-26 14:58:04.307882894 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_log.cc,v 1.16 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_merged.cc xorp-1.6/rib/rt_tab_merged.cc
--- xorp-1.6.orig/rib/rt_tab_merged.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_merged.cc	2011-02-26 14:58:04.348022248 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_merged.cc,v 1.24 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_origin.cc xorp-1.6/rib/rt_tab_origin.cc
--- xorp-1.6.orig/rib/rt_tab_origin.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_origin.cc	2011-02-26 14:58:04.287879123 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_origin.cc,v 1.27 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_pol_conn.cc xorp-1.6/rib/rt_tab_pol_conn.cc
--- xorp-1.6.orig/rib/rt_tab_pol_conn.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_pol_conn.cc	2011-02-26 14:58:04.296211547 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_pol_conn.cc,v 1.16 2009/01/05 18:31:07 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rib/rt_tab_pol_redist.cc xorp-1.6/rib/rt_tab_pol_redist.cc
--- xorp-1.6.orig/rib/rt_tab_pol_redist.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_pol_redist.cc	2011-02-26 14:58:04.352076368 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_pol_redist.cc,v 1.12 2009/01/05 18:31:07 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rib/rt_tab_redist.cc xorp-1.6/rib/rt_tab_redist.cc
--- xorp-1.6.orig/rib/rt_tab_redist.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_redist.cc	2011-02-26 14:58:04.343879137 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_redist.cc,v 1.28 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/rt_tab_register.cc xorp-1.6/rib/rt_tab_register.cc
--- xorp-1.6.orig/rib/rt_tab_register.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/rt_tab_register.cc	2011-02-26 14:58:04.368235299 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/rt_tab_register.cc,v 1.36 2009/01/05 18:31:07 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rib/test_deletion.cc xorp-1.6/rib/test_deletion.cc
--- xorp-1.6.orig/rib/test_deletion.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/test_deletion.cc	2011-02-26 14:58:04.332341307 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/test_deletion.cc,v 1.16 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/test_redist.cc xorp-1.6/rib/test_redist.cc
--- xorp-1.6.orig/rib/test_redist.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/test_redist.cc	2011-02-26 14:58:04.324453426 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/test_redist.cc,v 1.19 2009/01/05 18:31:07 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/rib/test_register.cc xorp-1.6/rib/test_register.cc
--- xorp-1.6.orig/rib/test_register.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/test_register.cc	2011-02-26 14:58:04.280316523 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/test_register.cc,v 1.28 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/test_register_xrls.cc xorp-1.6/rib/test_register_xrls.cc
--- xorp-1.6.orig/rib/test_register_xrls.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/test_register_xrls.cc	2011-02-26 14:58:04.303880161 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/test_register_xrls.cc,v 1.42 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/test_rib_direct.cc xorp-1.6/rib/test_rib_direct.cc
--- xorp-1.6.orig/rib/test_rib_direct.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/test_rib_direct.cc	2011-02-26 14:58:04.324453426 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/test_rib_direct.cc,v 1.27 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/test_rib_xrls.cc xorp-1.6/rib/test_rib_xrls.cc
--- xorp-1.6.orig/rib/test_rib_xrls.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/test_rib_xrls.cc	2011-02-26 14:58:04.259869359 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/test_rib_xrls.cc,v 1.48 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/tools/show_distances.cc xorp-1.6/rib/tools/show_distances.cc
--- xorp-1.6.orig/rib/tools/show_distances.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rib/tools/show_distances.cc	2011-02-26 14:58:04.268417475 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/tools/show_distances.cc,v 1.7 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rib/rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/tools/show_routes.cc xorp-1.6/rib/tools/show_routes.cc
--- xorp-1.6.orig/rib/tools/show_routes.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rib/tools/show_routes.cc	2011-02-26 14:58:04.271864611 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/tools/show_routes.cc,v 1.29 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rib/rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/vifmanager.cc xorp-1.6/rib/vifmanager.cc
--- xorp-1.6.orig/rib/vifmanager.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/vifmanager.cc	2011-02-26 14:58:04.275870446 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/vifmanager.cc,v 1.54 2009/01/05 18:31:07 jtc Exp $"
 
 #include "rib_module.h"
 
diff -rupN xorp-1.6.orig/rib/xrl_target.cc xorp-1.6/rib/xrl_target.cc
--- xorp-1.6.orig/rib/xrl_target.cc	2009-01-05 13:31:07.000000000 -0500
+++ xorp-1.6/rib/xrl_target.cc	2011-02-26 14:58:04.320285934 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rib/xrl_target.cc,v 1.66 2009/01/05 18:31:07 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rip/auth.cc xorp-1.6/rip/auth.cc
--- xorp-1.6.orig/rip/auth.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/auth.cc	2011-02-26 14:58:04.999868780 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/auth.cc,v 1.40 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/output_table.cc xorp-1.6/rip/output_table.cc
--- xorp-1.6.orig/rip/output_table.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/output_table.cc	2011-02-26 14:58:04.951986904 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/output_table.cc,v 1.21 2009/01/05 18:31:08 jtc Exp $"
 
 #include "libxorp/xorp.h"
 
diff -rupN xorp-1.6.orig/rip/output_updates.cc xorp-1.6/rip/output_updates.cc
--- xorp-1.6.orig/rip/output_updates.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/output_updates.cc	2011-02-26 14:58:04.995958720 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/output_updates.cc,v 1.22 2009/01/05 18:31:08 jtc Exp $"
 
 #include "output_updates.hh"
 #include "packet_assembly.hh"
diff -rupN xorp-1.6.orig/rip/packet_queue.cc xorp-1.6/rip/packet_queue.cc
--- xorp-1.6.orig/rip/packet_queue.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/packet_queue.cc	2011-02-26 14:58:04.967876320 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/packet_queue.cc,v 1.16 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/peer.cc xorp-1.6/rip/peer.cc
--- xorp-1.6.orig/rip/peer.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/peer.cc	2011-02-26 14:58:04.951986904 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/peer.cc,v 1.12 2009/01/05 18:31:08 jtc Exp $"
 
 #include "peer.hh"
 #include "port.hh"
diff -rupN xorp-1.6.orig/rip/port.cc xorp-1.6/rip/port.cc
--- xorp-1.6.orig/rip/port.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/port.cc	2011-02-26 14:58:04.988205924 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/port.cc,v 1.75 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/redist.cc xorp-1.6/rip/redist.cc
--- xorp-1.6.orig/rip/redist.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/redist.cc	2011-02-26 14:58:04.959859519 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/redist.cc,v 1.18 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 #include "libxorp/xlog.h"
diff -rupN xorp-1.6.orig/rip/rib_notifier_base.cc xorp-1.6/rip/rib_notifier_base.cc
--- xorp-1.6.orig/rip/rib_notifier_base.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/rib_notifier_base.cc	2011-02-26 14:58:05.003899757 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/rib_notifier_base.cc,v 1.13 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rib_notifier_base.hh"
 
diff -rupN xorp-1.6.orig/rip/rip_varrw.cc xorp-1.6/rip/rip_varrw.cc
--- xorp-1.6.orig/rip/rip_varrw.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/rip_varrw.cc	2011-02-26 14:58:04.975875384 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/rip_varrw.cc,v 1.16 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/rip/route_db.cc xorp-1.6/rip/route_db.cc
--- xorp-1.6.orig/rip/route_db.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/route_db.cc	2011-02-26 14:58:04.939904533 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/route_db.cc,v 1.39 2009/01/05 18:31:08 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rip/route_entry.cc xorp-1.6/rip/route_entry.cc
--- xorp-1.6.orig/rip/route_entry.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/route_entry.cc	2011-02-26 14:58:04.967876320 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/route_entry.cc,v 1.20 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/test_auth.cc xorp-1.6/rip/test_auth.cc
--- xorp-1.6.orig/rip/test_auth.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_auth.cc	2011-02-26 14:58:04.979869922 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_auth.cc,v 1.31 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/test_outputs.cc xorp-1.6/rip/test_outputs.cc
--- xorp-1.6.orig/rip/test_outputs.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_outputs.cc	2011-02-26 14:58:04.992498919 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_outputs.cc,v 1.36 2009/01/05 18:31:08 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/rip/test_packets.cc xorp-1.6/rip/test_packets.cc
--- xorp-1.6.orig/rip/test_packets.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_packets.cc	2011-02-26 14:58:04.947948551 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_packets.cc,v 1.20 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/test_request.cc xorp-1.6/rip/test_request.cc
--- xorp-1.6.orig/rip/test_request.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_request.cc	2011-02-26 14:58:04.931864263 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_request.cc,v 1.32 2009/01/05 18:31:08 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/rip/test_route_walk.cc xorp-1.6/rip/test_route_walk.cc
--- xorp-1.6.orig/rip/test_route_walk.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_route_walk.cc	2011-02-26 14:58:05.012065069 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_route_walk.cc,v 1.24 2009/01/05 18:31:08 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/rip/test_timers.cc xorp-1.6/rip/test_timers.cc
--- xorp-1.6.orig/rip/test_timers.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_timers.cc	2011-02-26 14:58:04.935912446 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_timers.cc,v 1.26 2009/01/05 18:31:08 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/rip/test_update_queue.cc xorp-1.6/rip/test_update_queue.cc
--- xorp-1.6.orig/rip/test_update_queue.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/test_update_queue.cc	2011-02-26 14:58:05.012065069 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/test_update_queue.cc,v 1.26 2009/01/05 18:31:08 jtc Exp $"
 
 #include <set>
 
diff -rupN xorp-1.6.orig/rip/tools/common.cc xorp-1.6/rip/tools/common.cc
--- xorp-1.6.orig/rip/tools/common.cc	2009-01-05 13:31:09.000000000 -0500
+++ xorp-1.6/rip/tools/common.cc	2011-02-26 14:58:04.915991936 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/tools/common.cc,v 1.14 2009/01/05 18:31:09 jtc Exp $"
 
 #include <string>
 
diff -rupN xorp-1.6.orig/rip/tools/rip_announcer.cc xorp-1.6/rip/tools/rip_announcer.cc
--- xorp-1.6.orig/rip/tools/rip_announcer.cc	2009-01-05 13:31:09.000000000 -0500
+++ xorp-1.6/rip/tools/rip_announcer.cc	2011-02-26 14:58:04.920149979 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/tools/rip_announcer.cc,v 1.18 2009/01/05 18:31:09 jtc Exp $"
 
 #include <vector>
 #include <fstream>
diff -rupN xorp-1.6.orig/rip/tools/ripng_announcer.cc xorp-1.6/rip/tools/ripng_announcer.cc
--- xorp-1.6.orig/rip/tools/ripng_announcer.cc	2009-01-05 13:31:09.000000000 -0500
+++ xorp-1.6/rip/tools/ripng_announcer.cc	2011-02-26 14:58:04.920149979 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/tools/ripng_announcer.cc,v 1.17 2009/01/05 18:31:09 jtc Exp $"
 
 #include "rip/rip_module.h"
 
diff -rupN xorp-1.6.orig/rip/tools/show_peer_stats.cc xorp-1.6/rip/tools/show_peer_stats.cc
--- xorp-1.6.orig/rip/tools/show_peer_stats.cc	2009-01-05 13:31:09.000000000 -0500
+++ xorp-1.6/rip/tools/show_peer_stats.cc	2011-02-26 14:58:04.927881403 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/tools/show_peer_stats.cc,v 1.17 2009/01/05 18:31:09 jtc Exp $"
 
 #include <iomanip>
 
diff -rupN xorp-1.6.orig/rip/tools/show_stats.cc xorp-1.6/rip/tools/show_stats.cc
--- xorp-1.6.orig/rip/tools/show_stats.cc	2009-01-05 13:31:09.000000000 -0500
+++ xorp-1.6/rip/tools/show_stats.cc	2011-02-26 14:58:04.924293135 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/tools/show_stats.cc,v 1.19 2009/01/05 18:31:09 jtc Exp $"
 
 #include <iomanip>
 
diff -rupN xorp-1.6.orig/rip/update_queue.cc xorp-1.6/rip/update_queue.cc
--- xorp-1.6.orig/rip/update_queue.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/update_queue.cc	2011-02-26 14:58:05.007989870 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/update_queue.cc,v 1.21 2009/01/05 18:31:08 jtc Exp $"
 
 #include <vector>
 #include <list>
diff -rupN xorp-1.6.orig/rip/xorp_rip_main.cc xorp-1.6/rip/xorp_rip_main.cc
--- xorp-1.6.orig/rip/xorp_rip_main.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xorp_rip_main.cc	2011-02-26 14:58:04.975875384 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xorp_rip_main.cc,v 1.22 2009/01/05 18:31:08 jtc Exp $"
 
 #include "rip_module.h"
 #include "libxorp/xlog.h"
diff -rupN xorp-1.6.orig/rip/xrl_config.cc xorp-1.6/rip/xrl_config.cc
--- xorp-1.6.orig/rip/xrl_config.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xrl_config.cc	2011-02-26 14:58:04.971864124 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xrl_config.cc,v 1.9 2009/01/05 18:31:08 jtc Exp $"
 
 #include "xrl_config.hh"
 
diff -rupN xorp-1.6.orig/rip/xrl_port_io.cc xorp-1.6/rip/xrl_port_io.cc
--- xorp-1.6.orig/rip/xrl_port_io.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xrl_port_io.cc	2011-02-26 14:58:04.943842676 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xrl_port_io.cc,v 1.31 2009/01/05 18:31:08 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/rip/xrl_port_manager.cc xorp-1.6/rip/xrl_port_manager.cc
--- xorp-1.6.orig/rip/xrl_port_manager.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xrl_port_manager.cc	2011-02-26 14:58:04.963867319 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xrl_port_manager.cc,v 1.34 2009/01/05 18:31:08 jtc Exp $"
 
 // #define DEBUG_LOGGING
 #include "rip_module.h"
diff -rupN xorp-1.6.orig/rip/xrl_process_spy.cc xorp-1.6/rip/xrl_process_spy.cc
--- xorp-1.6.orig/rip/xrl_process_spy.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xrl_process_spy.cc	2011-02-26 14:58:04.995958720 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xrl_process_spy.cc,v 1.15 2009/01/05 18:31:08 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/rip/xrl_redist_manager.cc xorp-1.6/rip/xrl_redist_manager.cc
--- xorp-1.6.orig/rip/xrl_redist_manager.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xrl_redist_manager.cc	2011-02-26 14:58:04.939904533 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xrl_redist_manager.cc,v 1.23 2009/01/05 18:31:08 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/rip/xrl_rib_notifier.cc xorp-1.6/rip/xrl_rib_notifier.cc
--- xorp-1.6.orig/rip/xrl_rib_notifier.cc	2009-01-05 13:31:08.000000000 -0500
+++ xorp-1.6/rip/xrl_rib_notifier.cc	2011-02-26 14:58:04.956600634 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rip/xrl_rib_notifier.cc,v 1.21 2009/01/05 18:31:08 jtc Exp $"
 
 // #define DEBUG_LOGGING
 
diff -rupN xorp-1.6.orig/rtrmgr/cli.cc xorp-1.6/rtrmgr/cli.cc
--- xorp-1.6.orig/rtrmgr/cli.cc	2009-01-05 13:31:09.000000000 -0500
+++ xorp-1.6/rtrmgr/cli.cc	2011-02-26 14:58:05.071862765 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/cli.cc,v 1.143 2009/01/05 18:31:09 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/command_tree.cc xorp-1.6/rtrmgr/command_tree.cc
--- xorp-1.6.orig/rtrmgr/command_tree.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/command_tree.cc	2011-02-26 14:58:05.016405028 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/command_tree.cc,v 1.17 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/config_operators.cc xorp-1.6/rtrmgr/config_operators.cc
--- xorp-1.6.orig/rtrmgr/config_operators.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/config_operators.cc	2011-02-26 14:58:05.091881463 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/config_operators.cc,v 1.10 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/rtrmgr/conf_tree.cc xorp-1.6/rtrmgr/conf_tree.cc
--- xorp-1.6.orig/rtrmgr/conf_tree.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/conf_tree.cc	2011-02-26 14:58:05.143868403 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/conf_tree.cc,v 1.57 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/conf_tree_node.cc xorp-1.6/rtrmgr/conf_tree_node.cc
--- xorp-1.6.orig/rtrmgr/conf_tree_node.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/conf_tree_node.cc	2011-02-26 14:58:05.055882641 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/conf_tree_node.cc,v 1.119 2009/01/05 18:31:10 jtc Exp $"
 
 //#define DEBUG_LOGGING
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/generic_module_manager.cc xorp-1.6/rtrmgr/generic_module_manager.cc
--- xorp-1.6.orig/rtrmgr/generic_module_manager.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/generic_module_manager.cc	2011-02-26 14:58:05.147877672 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/generic_module_manager.cc,v 1.13 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/main_rtrmgr.cc xorp-1.6/rtrmgr/main_rtrmgr.cc
--- xorp-1.6.orig/rtrmgr/main_rtrmgr.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/main_rtrmgr.cc	2011-02-26 14:58:05.157002722 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/main_rtrmgr.cc,v 1.81 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/master_conf_tree.cc xorp-1.6/rtrmgr/master_conf_tree.cc
--- xorp-1.6.orig/rtrmgr/master_conf_tree.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/master_conf_tree.cc	2011-02-26 14:58:05.048296814 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/master_conf_tree.cc,v 1.84 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/master_conf_tree_node.cc xorp-1.6/rtrmgr/master_conf_tree_node.cc
--- xorp-1.6.orig/rtrmgr/master_conf_tree_node.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/master_conf_tree_node.cc	2011-02-26 14:58:05.128296838 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/master_conf_tree_node.cc,v 1.29 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/master_template_tree.cc xorp-1.6/rtrmgr/master_template_tree.cc
--- xorp-1.6.orig/rtrmgr/master_template_tree.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/master_template_tree.cc	2011-02-26 14:58:05.151894548 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/master_template_tree.cc,v 1.15 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/master_template_tree_node.cc xorp-1.6/rtrmgr/master_template_tree_node.cc
--- xorp-1.6.orig/rtrmgr/master_template_tree_node.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/master_template_tree_node.cc	2011-02-26 14:58:05.163858812 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/master_template_tree_node.cc,v 1.19 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/module_command.cc xorp-1.6/rtrmgr/module_command.cc
--- xorp-1.6.orig/rtrmgr/module_command.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/module_command.cc	2011-02-26 14:58:05.172194374 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/module_command.cc,v 1.41 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/module_manager.cc xorp-1.6/rtrmgr/module_manager.cc
--- xorp-1.6.orig/rtrmgr/module_manager.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/module_manager.cc	2011-02-26 14:58:05.019921040 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/module_manager.cc,v 1.69 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/op_commands.cc xorp-1.6/rtrmgr/op_commands.cc
--- xorp-1.6.orig/rtrmgr/op_commands.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/op_commands.cc	2011-02-26 14:58:05.159863804 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/op_commands.cc,v 1.74 2009/01/05 18:31:10 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rtrmgr/profiler.cc xorp-1.6/rtrmgr/profiler.cc
--- xorp-1.6.orig/rtrmgr/profiler.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/profiler.cc	2011-02-26 14:58:05.172194374 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/profiler.cc,v 1.12 2009/01/05 18:31:10 jtc Exp $"
 
 // Access the profiling support in XORP processes.
 
diff -rupN xorp-1.6.orig/rtrmgr/randomness.cc xorp-1.6/rtrmgr/randomness.cc
--- xorp-1.6.orig/rtrmgr/randomness.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/randomness.cc	2011-02-26 14:58:05.119889439 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/randomness.cc,v 1.25 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/slave_conf_tree.cc xorp-1.6/rtrmgr/slave_conf_tree.cc
--- xorp-1.6.orig/rtrmgr/slave_conf_tree.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/slave_conf_tree.cc	2011-02-26 14:58:05.036073674 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/slave_conf_tree.cc,v 1.42 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/slave_conf_tree_node.cc xorp-1.6/rtrmgr/slave_conf_tree_node.cc
--- xorp-1.6.orig/rtrmgr/slave_conf_tree_node.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/slave_conf_tree_node.cc	2011-02-26 14:58:05.063846853 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/slave_conf_tree_node.cc,v 1.36 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/slave_module_manager.cc xorp-1.6/rtrmgr/slave_module_manager.cc
--- xorp-1.6.orig/rtrmgr/slave_module_manager.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/slave_module_manager.cc	2011-02-26 14:58:05.119889439 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/slave_module_manager.cc,v 1.27 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/task.cc xorp-1.6/rtrmgr/task.cc
--- xorp-1.6.orig/rtrmgr/task.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/task.cc	2011-02-26 14:58:05.135881472 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/task.cc,v 1.65 2009/01/05 18:31:10 jtc Exp $"
 
 // #define DEBUG_LOGGING
 // #define DEBUG_PRINT_FUNCTION_NAME
diff -rupN xorp-1.6.orig/rtrmgr/template_base_command.cc xorp-1.6/rtrmgr/template_base_command.cc
--- xorp-1.6.orig/rtrmgr/template_base_command.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/template_base_command.cc	2011-02-26 14:58:05.112327528 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/template_base_command.cc,v 1.27 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/template_commands.cc xorp-1.6/rtrmgr/template_commands.cc
--- xorp-1.6.orig/rtrmgr/template_commands.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/template_commands.cc	2011-02-26 14:58:05.088536057 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/template_commands.cc,v 1.74 2009/01/05 18:31:10 jtc Exp $"
 
 #include <list>
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/template_tree.cc xorp-1.6/rtrmgr/template_tree.cc
--- xorp-1.6.orig/rtrmgr/template_tree.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/template_tree.cc	2011-02-26 14:58:05.059918549 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/template_tree.cc,v 1.48 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/template_tree_node.cc xorp-1.6/rtrmgr/template_tree_node.cc
--- xorp-1.6.orig/rtrmgr/template_tree_node.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/template_tree_node.cc	2011-02-26 14:58:05.079995752 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/template_tree_node.cc,v 1.84 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/test_module_manager.cc xorp-1.6/rtrmgr/test_module_manager.cc
--- xorp-1.6.orig/rtrmgr/test_module_manager.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/test_module_manager.cc	2011-02-26 14:58:05.040489580 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/test_module_manager.cc,v 1.26 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/test_sample_config.cc xorp-1.6/rtrmgr/test_sample_config.cc
--- xorp-1.6.orig/rtrmgr/test_sample_config.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/test_sample_config.cc	2011-02-26 14:58:05.123866646 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/test_sample_config.cc,v 1.32 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include <signal.h>
diff -rupN xorp-1.6.orig/rtrmgr/test_templates.cc xorp-1.6/rtrmgr/test_templates.cc
--- xorp-1.6.orig/rtrmgr/test_templates.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/test_templates.cc	2011-02-26 14:58:05.139868301 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/test_templates.cc,v 1.23 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include <signal.h>
diff -rupN xorp-1.6.orig/rtrmgr/unexpanded_program.cc xorp-1.6/rtrmgr/unexpanded_program.cc
--- xorp-1.6.orig/rtrmgr/unexpanded_program.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/unexpanded_program.cc	2011-02-26 14:58:05.027868339 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/unexpanded_program.cc,v 1.7 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/unexpanded_xrl.cc xorp-1.6/rtrmgr/unexpanded_xrl.cc
--- xorp-1.6.orig/rtrmgr/unexpanded_xrl.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/unexpanded_xrl.cc	2011-02-26 14:58:05.040489580 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/unexpanded_xrl.cc,v 1.19 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/userdb.cc xorp-1.6/rtrmgr/userdb.cc
--- xorp-1.6.orig/rtrmgr/userdb.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/userdb.cc	2011-02-26 14:58:05.100199751 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/userdb.cc,v 1.26 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/util.cc xorp-1.6/rtrmgr/util.cc
--- xorp-1.6.orig/rtrmgr/util.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/util.cc	2011-02-26 14:58:05.091881463 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/util.cc,v 1.31 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/xorp_client.cc xorp-1.6/rtrmgr/xorp_client.cc
--- xorp-1.6.orig/rtrmgr/xorp_client.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/xorp_client.cc	2011-02-26 14:58:05.116046404 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/xorp_client.cc,v 1.31 2009/01/05 18:31:10 jtc Exp $"
 
 
 #include "rtrmgr_module.h"
diff -rupN xorp-1.6.orig/rtrmgr/xorpsh_main.cc xorp-1.6/rtrmgr/xorpsh_main.cc
--- xorp-1.6.orig/rtrmgr/xorpsh_main.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/xorpsh_main.cc	2011-02-26 14:58:05.108018238 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/xorpsh_main.cc,v 1.76 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/xrldb.cc xorp-1.6/rtrmgr/xrldb.cc
--- xorp-1.6.orig/rtrmgr/xrldb.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/xrldb.cc	2011-02-26 14:58:05.104248675 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/xrldb.cc,v 1.23 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/xrl_rtrmgr_interface.cc xorp-1.6/rtrmgr/xrl_rtrmgr_interface.cc
--- xorp-1.6.orig/rtrmgr/xrl_rtrmgr_interface.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/xrl_rtrmgr_interface.cc	2011-02-26 14:58:05.023961462 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/xrl_rtrmgr_interface.cc,v 1.58 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/xrl_xorpsh_interface.cc xorp-1.6/rtrmgr/xrl_xorpsh_interface.cc
--- xorp-1.6.orig/rtrmgr/xrl_xorpsh_interface.cc	2009-01-05 13:31:10.000000000 -0500
+++ xorp-1.6/rtrmgr/xrl_xorpsh_interface.cc	2011-02-26 14:58:05.168026894 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/rtrmgr/xrl_xorpsh_interface.cc,v 1.27 2009/01/05 18:31:10 jtc Exp $"
 
 #include "rtrmgr_module.h"
 
diff -rupN xorp-1.6.orig/rtrmgr/y.boot_tab.cc xorp-1.6/rtrmgr/y.boot_tab.cc
--- xorp-1.6.orig/rtrmgr/y.boot_tab.cc	2005-09-27 14:37:32.000000000 -0400
+++ xorp-1.6/rtrmgr/y.boot_tab.cc	2011-02-26 14:58:05.147877672 -0500
@@ -1,5 +1,4 @@
 #ifndef lint
-#ident "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28.2.1 2001/07/19 05:46:39 peter Exp $"
 #endif
 #include <stdlib.h>
 #define YYBYACC 1
diff -rupN xorp-1.6.orig/rtrmgr/y.opcmd_tab.cc xorp-1.6/rtrmgr/y.opcmd_tab.cc
--- xorp-1.6.orig/rtrmgr/y.opcmd_tab.cc	2006-01-27 21:12:00.000000000 -0500
+++ xorp-1.6/rtrmgr/y.opcmd_tab.cc	2011-02-26 14:58:05.031909641 -0500
@@ -1,5 +1,4 @@
 #ifndef lint
-#ident "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28.2.1 2001/07/19 05:46:39 peter Exp $"
 #endif
 #include <stdlib.h>
 #define YYBYACC 1
diff -rupN xorp-1.6.orig/rtrmgr/y.tplt_tab.cc xorp-1.6/rtrmgr/y.tplt_tab.cc
--- xorp-1.6.orig/rtrmgr/y.tplt_tab.cc	2006-02-02 14:45:02.000000000 -0500
+++ xorp-1.6/rtrmgr/y.tplt_tab.cc	2011-02-26 14:58:05.095870085 -0500
@@ -1,5 +1,4 @@
 #ifndef lint
-#ident "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28.2.1 2001/07/19 05:46:39 peter Exp $"
 #endif
 #include <stdlib.h>
 #define YYBYACC 1
diff -rupN xorp-1.6.orig/static_routes/static_routes_node.cc xorp-1.6/static_routes/static_routes_node.cc
--- xorp-1.6.orig/static_routes/static_routes_node.cc	2009-01-05 13:31:11.000000000 -0500
+++ xorp-1.6/static_routes/static_routes_node.cc	2011-02-26 14:58:02.659877110 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/static_routes/static_routes_node.cc,v 1.42 2009/01/05 18:31:11 jtc Exp $"
 
 //
 // StaticRoutes node implementation.
diff -rupN xorp-1.6.orig/static_routes/static_routes_varrw.cc xorp-1.6/static_routes/static_routes_varrw.cc
--- xorp-1.6.orig/static_routes/static_routes_varrw.cc	2009-01-05 13:31:11.000000000 -0500
+++ xorp-1.6/static_routes/static_routes_varrw.cc	2011-02-26 14:58:02.659877110 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/static_routes/static_routes_varrw.cc,v 1.15 2009/01/05 18:31:11 jtc Exp $"
 
 #include "static_routes_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/static_routes/xorp_static_routes.cc xorp-1.6/static_routes/xorp_static_routes.cc
--- xorp-1.6.orig/static_routes/xorp_static_routes.cc	2009-01-05 13:31:11.000000000 -0500
+++ xorp-1.6/static_routes/xorp_static_routes.cc	2011-02-26 14:58:02.648167946 -0500
@@ -17,7 +17,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/static_routes/xorp_static_routes.cc,v 1.18 2009/01/05 18:31:11 jtc Exp $"
 
 //
 // XORP StaticRoutes module implementation.
diff -rupN xorp-1.6.orig/static_routes/xrl_static_routes_node.cc xorp-1.6/static_routes/xrl_static_routes_node.cc
--- xorp-1.6.orig/static_routes/xrl_static_routes_node.cc	2009-01-05 13:31:11.000000000 -0500
+++ xorp-1.6/static_routes/xrl_static_routes_node.cc	2011-02-26 14:58:02.655871235 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/static_routes/xrl_static_routes_node.cc,v 1.44 2009/01/05 18:31:11 jtc Exp $"
 
 #include "static_routes_module.h"
 
diff -rupN xorp-1.6.orig/utils/runit.cc xorp-1.6/utils/runit.cc
--- xorp-1.6.orig/utils/runit.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/utils/runit.cc	2011-02-26 14:58:03.811939831 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/utils/runit.cc,v 1.24 2009/01/05 18:31:12 jtc Exp $"
 
 #include "libxorp/xorp.h"
 #include "libxorp/utils.hh"
diff -rupN xorp-1.6.orig/vrrp/arpd.cc xorp-1.6/vrrp/arpd.cc
--- xorp-1.6.orig/vrrp/arpd.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/arpd.cc	2011-02-26 14:58:04.031862337 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/arpd.cc,v 1.6 2009/01/05 18:31:12 jtc Exp $"
 
 #include "vrrp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/vrrp/test/vrrp_test.cc xorp-1.6/vrrp/test/vrrp_test.cc
--- xorp-1.6.orig/vrrp/test/vrrp_test.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/test/vrrp_test.cc	2011-02-26 14:58:04.027882233 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/test/vrrp_test.cc,v 1.9 2009/01/05 18:31:12 jtc Exp $"
 
 #include "vrrp/vrrp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/vrrp/vrrp.cc xorp-1.6/vrrp/vrrp.cc
--- xorp-1.6.orig/vrrp/vrrp.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/vrrp.cc	2011-02-26 14:58:04.015874242 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/vrrp.cc,v 1.18 2009/01/05 18:31:12 jtc Exp $"
 
 #include <sstream>
 
diff -rupN xorp-1.6.orig/vrrp/vrrp_packet.cc xorp-1.6/vrrp/vrrp_packet.cc
--- xorp-1.6.orig/vrrp/vrrp_packet.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/vrrp_packet.cc	2011-02-26 14:58:04.027882233 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/vrrp_packet.cc,v 1.6 2009/01/05 18:31:12 jtc Exp $"
 
 #include "vrrp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/vrrp/vrrp_target.cc xorp-1.6/vrrp/vrrp_target.cc
--- xorp-1.6.orig/vrrp/vrrp_target.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/vrrp_target.cc	2011-02-26 14:58:04.023950534 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/vrrp_target.cc,v 1.16 2009/01/05 18:31:12 jtc Exp $"
 
 #include <sstream>
 
diff -rupN xorp-1.6.orig/vrrp/vrrp_vif.cc xorp-1.6/vrrp/vrrp_vif.cc
--- xorp-1.6.orig/vrrp/vrrp_vif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/vrrp_vif.cc	2011-02-26 14:58:04.012352240 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/vrrp_vif.cc,v 1.12 2009/01/05 18:31:12 jtc Exp $"
 
 #include "vrrp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/vrrp/xorp_vrrp.cc xorp-1.6/vrrp/xorp_vrrp.cc
--- xorp-1.6.orig/vrrp/xorp_vrrp.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/vrrp/xorp_vrrp.cc	2011-02-26 14:58:04.020313496 -0500
@@ -18,7 +18,6 @@
 // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/vrrp/xorp_vrrp.cc,v 1.5 2009/01/05 18:31:12 jtc Exp $"
 
 #include "vrrp_module.h"
 #include "libxorp/xorp.h"
diff -rupN xorp-1.6.orig/xrl/interfaces/bgp_mib_traps_xif.cc xorp-1.6/xrl/interfaces/bgp_mib_traps_xif.cc
--- xorp-1.6.orig/xrl/interfaces/bgp_mib_traps_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/bgp_mib_traps_xif.cc	2011-02-26 14:58:03.388201795 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/bgp_mib_traps_xif.cc,v 1.19 2009/01/05 18:31:12 jtc Exp $"
 
 #include "bgp_mib_traps_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/bgp_xif.cc xorp-1.6/xrl/interfaces/bgp_xif.cc
--- xorp-1.6.orig/xrl/interfaces/bgp_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/bgp_xif.cc	2011-02-26 14:58:03.456428185 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/bgp_xif.cc,v 1.56 2009/01/05 18:31:12 jtc Exp $"
 
 #include "bgp_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/cli_manager_xif.cc xorp-1.6/xrl/interfaces/cli_manager_xif.cc
--- xorp-1.6.orig/xrl/interfaces/cli_manager_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/cli_manager_xif.cc	2011-02-26 14:58:03.435954619 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/cli_manager_xif.cc,v 1.26 2009/01/05 18:31:12 jtc Exp $"
 
 #include "cli_manager_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/cli_processor_xif.cc xorp-1.6/xrl/interfaces/cli_processor_xif.cc
--- xorp-1.6.orig/xrl/interfaces/cli_processor_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/cli_processor_xif.cc	2011-02-26 14:58:03.327873886 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/cli_processor_xif.cc,v 1.23 2009/01/05 18:31:12 jtc Exp $"
 
 #include "cli_processor_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/common_xif.cc xorp-1.6/xrl/interfaces/common_xif.cc
--- xorp-1.6.orig/xrl/interfaces/common_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/common_xif.cc	2011-02-26 14:58:03.203897209 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/common_xif.cc,v 1.25 2009/01/05 18:31:12 jtc Exp $"
 
 #include "common_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/coord_xif.cc xorp-1.6/xrl/interfaces/coord_xif.cc
--- xorp-1.6.orig/xrl/interfaces/coord_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/coord_xif.cc	2011-02-26 14:58:03.427884125 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/coord_xif.cc,v 1.24 2009/01/05 18:31:12 jtc Exp $"
 
 #include "coord_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/datain_xif.cc xorp-1.6/xrl/interfaces/datain_xif.cc
--- xorp-1.6.orig/xrl/interfaces/datain_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/datain_xif.cc	2011-02-26 14:58:03.388201795 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/datain_xif.cc,v 1.24 2009/01/05 18:31:12 jtc Exp $"
 
 #include "datain_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_click_xif.cc xorp-1.6/xrl/interfaces/fea_click_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_click_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_click_xif.cc	2011-02-26 14:58:03.376208324 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_click_xif.cc,v 1.18 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_click_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_fib_client_xif.cc xorp-1.6/xrl/interfaces/fea_fib_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_fib_client_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_fib_client_xif.cc	2011-02-26 14:58:03.347905535 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_fib_client_xif.cc,v 1.18 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_fib_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_fib_xif.cc xorp-1.6/xrl/interfaces/fea_fib_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_fib_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_fib_xif.cc	2011-02-26 14:58:03.231870542 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_fib_xif.cc,v 1.18 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_fib_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_firewall_xif.cc xorp-1.6/xrl/interfaces/fea_firewall_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_firewall_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_firewall_xif.cc	2011-02-26 14:58:03.244216933 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_firewall_xif.cc,v 1.7 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_firewall_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_ifmgr_mirror_xif.cc xorp-1.6/xrl/interfaces/fea_ifmgr_mirror_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_ifmgr_mirror_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_ifmgr_mirror_xif.cc	2011-02-26 14:58:03.215878521 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_ifmgr_mirror_xif.cc,v 1.31 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_ifmgr_mirror_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_ifmgr_replicator_xif.cc xorp-1.6/xrl/interfaces/fea_ifmgr_replicator_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_ifmgr_replicator_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_ifmgr_replicator_xif.cc	2011-02-26 14:58:03.351929583 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_ifmgr_replicator_xif.cc,v 1.17 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_ifmgr_replicator_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_ifmgr_xif.cc xorp-1.6/xrl/interfaces/fea_ifmgr_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_ifmgr_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_ifmgr_xif.cc	2011-02-26 14:58:03.416118388 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_ifmgr_xif.cc,v 1.48 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_ifmgr_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_rawlink_client_xif.cc xorp-1.6/xrl/interfaces/fea_rawlink_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_rawlink_client_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_rawlink_client_xif.cc	2011-02-26 14:58:03.359861146 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_rawlink_client_xif.cc,v 1.9 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_rawlink_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_rawlink_xif.cc xorp-1.6/xrl/interfaces/fea_rawlink_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_rawlink_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_rawlink_xif.cc	2011-02-26 14:58:03.368798263 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_rawlink_xif.cc,v 1.10 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_rawlink_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_rawpkt4_client_xif.cc xorp-1.6/xrl/interfaces/fea_rawpkt4_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_rawpkt4_client_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_rawpkt4_client_xif.cc	2011-02-26 14:58:03.380155537 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_rawpkt4_client_xif.cc,v 1.17 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_rawpkt4_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_rawpkt4_xif.cc xorp-1.6/xrl/interfaces/fea_rawpkt4_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_rawpkt4_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_rawpkt4_xif.cc	2011-02-26 14:58:03.219874239 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_rawpkt4_xif.cc,v 1.18 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_rawpkt4_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_rawpkt6_client_xif.cc xorp-1.6/xrl/interfaces/fea_rawpkt6_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_rawpkt6_client_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_rawpkt6_client_xif.cc	2011-02-26 14:58:03.340357214 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_rawpkt6_client_xif.cc,v 1.19 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_rawpkt6_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fea_rawpkt6_xif.cc xorp-1.6/xrl/interfaces/fea_rawpkt6_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fea_rawpkt6_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fea_rawpkt6_xif.cc	2011-02-26 14:58:03.208190560 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fea_rawpkt6_xif.cc,v 1.20 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fea_rawpkt6_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fib2mrib_xif.cc xorp-1.6/xrl/interfaces/fib2mrib_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fib2mrib_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fib2mrib_xif.cc	2011-02-26 14:58:03.303868439 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fib2mrib_xif.cc,v 1.17 2009/01/05 18:31:12 jtc Exp $"
 
 #include "fib2mrib_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/finder_client_xif.cc xorp-1.6/xrl/interfaces/finder_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/finder_client_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/finder_client_xif.cc	2011-02-26 14:58:03.351929583 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/finder_client_xif.cc,v 1.25 2009/01/05 18:31:12 jtc Exp $"
 
 #include "finder_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/finder_event_notifier_xif.cc xorp-1.6/xrl/interfaces/finder_event_notifier_xif.cc
--- xorp-1.6.orig/xrl/interfaces/finder_event_notifier_xif.cc	2009-01-05 13:31:12.000000000 -0500
+++ xorp-1.6/xrl/interfaces/finder_event_notifier_xif.cc	2011-02-26 14:58:03.268012020 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/finder_event_notifier_xif.cc,v 1.21 2009/01/05 18:31:12 jtc Exp $"
 
 #include "finder_event_notifier_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/finder_event_observer_xif.cc xorp-1.6/xrl/interfaces/finder_event_observer_xif.cc
--- xorp-1.6.orig/xrl/interfaces/finder_event_observer_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/finder_event_observer_xif.cc	2011-02-26 14:58:03.383876578 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/finder_event_observer_xif.cc,v 1.20 2009/01/05 18:31:13 jtc Exp $"
 
 #include "finder_event_observer_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/finder_xif.cc xorp-1.6/xrl/interfaces/finder_xif.cc
--- xorp-1.6.orig/xrl/interfaces/finder_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/finder_xif.cc	2011-02-26 14:58:03.215878521 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/finder_xif.cc,v 1.29 2009/01/05 18:31:13 jtc Exp $"
 
 #include "finder_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/fti_xif.cc xorp-1.6/xrl/interfaces/fti_xif.cc
--- xorp-1.6.orig/xrl/interfaces/fti_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/fti_xif.cc	2011-02-26 14:58:03.240506331 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/fti_xif.cc,v 1.26 2009/01/05 18:31:13 jtc Exp $"
 
 #include "fti_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/mfea_client_xif.cc xorp-1.6/xrl/interfaces/mfea_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/mfea_client_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/mfea_client_xif.cc	2011-02-26 14:58:03.363926498 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/mfea_client_xif.cc,v 1.33 2009/01/05 18:31:13 jtc Exp $"
 
 #include "mfea_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/mfea_xif.cc xorp-1.6/xrl/interfaces/mfea_xif.cc
--- xorp-1.6.orig/xrl/interfaces/mfea_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/mfea_xif.cc	2011-02-26 14:58:03.231870542 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/mfea_xif.cc,v 1.31 2009/01/05 18:31:13 jtc Exp $"
 
 #include "mfea_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/mld6igmp_client_xif.cc xorp-1.6/xrl/interfaces/mld6igmp_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/mld6igmp_client_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/mld6igmp_client_xif.cc	2011-02-26 14:58:03.439906564 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/mld6igmp_client_xif.cc,v 1.24 2009/01/05 18:31:13 jtc Exp $"
 
 #include "mld6igmp_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/mld6igmp_xif.cc xorp-1.6/xrl/interfaces/mld6igmp_xif.cc
--- xorp-1.6.orig/xrl/interfaces/mld6igmp_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/mld6igmp_xif.cc	2011-02-26 14:58:03.420271680 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/mld6igmp_xif.cc,v 1.29 2009/01/05 18:31:13 jtc Exp $"
 
 #include "mld6igmp_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/olsr4_xif.cc xorp-1.6/xrl/interfaces/olsr4_xif.cc
--- xorp-1.6.orig/xrl/interfaces/olsr4_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/olsr4_xif.cc	2011-02-26 14:58:03.263863954 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/olsr4_xif.cc,v 1.6 2009/01/05 18:31:13 jtc Exp $"
 
 #include "olsr4_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/ospfv2_xif.cc xorp-1.6/xrl/interfaces/ospfv2_xif.cc
--- xorp-1.6.orig/xrl/interfaces/ospfv2_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/ospfv2_xif.cc	2011-02-26 14:58:03.335886417 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/ospfv2_xif.cc,v 1.35 2009/01/05 18:31:13 jtc Exp $"
 
 #include "ospfv2_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/ospfv3_xif.cc xorp-1.6/xrl/interfaces/ospfv3_xif.cc
--- xorp-1.6.orig/xrl/interfaces/ospfv3_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/ospfv3_xif.cc	2011-02-26 14:58:03.404769938 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/ospfv3_xif.cc,v 1.22 2009/01/05 18:31:13 jtc Exp $"
 
 #include "ospfv3_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/pim_xif.cc xorp-1.6/xrl/interfaces/pim_xif.cc
--- xorp-1.6.orig/xrl/interfaces/pim_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/pim_xif.cc	2011-02-26 14:58:03.299874695 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/pim_xif.cc,v 1.46 2009/01/05 18:31:13 jtc Exp $"
 
 #include "pim_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/policy_backend_xif.cc xorp-1.6/xrl/interfaces/policy_backend_xif.cc
--- xorp-1.6.orig/xrl/interfaces/policy_backend_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/policy_backend_xif.cc	2011-02-26 14:58:03.447873472 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/policy_backend_xif.cc,v 1.14 2009/01/05 18:31:13 jtc Exp $"
 
 #include "policy_backend_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/policy_redist4_xif.cc xorp-1.6/xrl/interfaces/policy_redist4_xif.cc
--- xorp-1.6.orig/xrl/interfaces/policy_redist4_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/policy_redist4_xif.cc	2011-02-26 14:58:03.404769938 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/policy_redist4_xif.cc,v 1.14 2009/01/05 18:31:13 jtc Exp $"
 
 #include "policy_redist4_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/policy_redist6_xif.cc xorp-1.6/xrl/interfaces/policy_redist6_xif.cc
--- xorp-1.6.orig/xrl/interfaces/policy_redist6_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/policy_redist6_xif.cc	2011-02-26 14:58:03.380155537 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/policy_redist6_xif.cc,v 1.14 2009/01/05 18:31:13 jtc Exp $"
 
 #include "policy_redist6_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/policy_xif.cc xorp-1.6/xrl/interfaces/policy_xif.cc
--- xorp-1.6.orig/xrl/interfaces/policy_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/policy_xif.cc	2011-02-26 14:58:03.444672849 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/policy_xif.cc,v 1.22 2009/01/05 18:31:13 jtc Exp $"
 
 #include "policy_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/profile_client_xif.cc xorp-1.6/xrl/interfaces/profile_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/profile_client_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/profile_client_xif.cc	2011-02-26 14:58:03.340357214 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/profile_client_xif.cc,v 1.14 2009/01/05 18:31:13 jtc Exp $"
 
 #include "profile_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/profile_xif.cc xorp-1.6/xrl/interfaces/profile_xif.cc
--- xorp-1.6.orig/xrl/interfaces/profile_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/profile_xif.cc	2011-02-26 14:58:03.276308957 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/profile_xif.cc,v 1.14 2009/01/05 18:31:13 jtc Exp $"
 
 #include "profile_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/redist4_xif.cc xorp-1.6/xrl/interfaces/redist4_xif.cc
--- xorp-1.6.orig/xrl/interfaces/redist4_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/redist4_xif.cc	2011-02-26 14:58:03.432082225 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/redist4_xif.cc,v 1.22 2009/01/05 18:31:13 jtc Exp $"
 
 #include "redist4_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/redist6_xif.cc xorp-1.6/xrl/interfaces/redist6_xif.cc
--- xorp-1.6.orig/xrl/interfaces/redist6_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/redist6_xif.cc	2011-02-26 14:58:03.391862727 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/redist6_xif.cc,v 1.22 2009/01/05 18:31:13 jtc Exp $"
 
 #include "redist6_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/redist_transaction4_xif.cc xorp-1.6/xrl/interfaces/redist_transaction4_xif.cc
--- xorp-1.6.orig/xrl/interfaces/redist_transaction4_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/redist_transaction4_xif.cc	2011-02-26 14:58:03.255866957 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/redist_transaction4_xif.cc,v 1.21 2009/01/05 18:31:13 jtc Exp $"
 
 #include "redist_transaction4_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/redist_transaction6_xif.cc xorp-1.6/xrl/interfaces/redist_transaction6_xif.cc
--- xorp-1.6.orig/xrl/interfaces/redist_transaction6_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/redist_transaction6_xif.cc	2011-02-26 14:58:03.460297191 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/redist_transaction6_xif.cc,v 1.21 2009/01/05 18:31:13 jtc Exp $"
 
 #include "redist_transaction6_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/rib_client_xif.cc xorp-1.6/xrl/interfaces/rib_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/rib_client_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/rib_client_xif.cc	2011-02-26 14:58:03.371865409 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/rib_client_xif.cc,v 1.24 2009/01/05 18:31:13 jtc Exp $"
 
 #include "rib_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/rib_xif.cc xorp-1.6/xrl/interfaces/rib_xif.cc
--- xorp-1.6.orig/xrl/interfaces/rib_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/rib_xif.cc	2011-02-26 14:58:03.327873886 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/rib_xif.cc,v 1.42 2009/01/05 18:31:13 jtc Exp $"
 
 #include "rib_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/ripng_xif.cc xorp-1.6/xrl/interfaces/ripng_xif.cc
--- xorp-1.6.orig/xrl/interfaces/ripng_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/ripng_xif.cc	2011-02-26 14:58:03.311883700 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/ripng_xif.cc,v 1.23 2009/01/05 18:31:13 jtc Exp $"
 
 #include "ripng_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/rip_xif.cc xorp-1.6/xrl/interfaces/rip_xif.cc
--- xorp-1.6.orig/xrl/interfaces/rip_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/rip_xif.cc	2011-02-26 14:58:03.251894448 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/rip_xif.cc,v 1.25 2009/01/05 18:31:13 jtc Exp $"
 
 #include "rip_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/rtrmgr_client_xif.cc xorp-1.6/xrl/interfaces/rtrmgr_client_xif.cc
--- xorp-1.6.orig/xrl/interfaces/rtrmgr_client_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/rtrmgr_client_xif.cc	2011-02-26 14:58:03.272721545 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/rtrmgr_client_xif.cc,v 1.25 2009/01/05 18:31:13 jtc Exp $"
 
 #include "rtrmgr_client_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/rtrmgr_xif.cc xorp-1.6/xrl/interfaces/rtrmgr_xif.cc
--- xorp-1.6.orig/xrl/interfaces/rtrmgr_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/rtrmgr_xif.cc	2011-02-26 14:58:03.355871227 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/rtrmgr_xif.cc,v 1.27 2009/01/05 18:31:13 jtc Exp $"
 
 #include "rtrmgr_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/socket4_user_xif.cc xorp-1.6/xrl/interfaces/socket4_user_xif.cc
--- xorp-1.6.orig/xrl/interfaces/socket4_user_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/socket4_user_xif.cc	2011-02-26 14:58:03.255866957 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/socket4_user_xif.cc,v 1.21 2009/01/05 18:31:13 jtc Exp $"
 
 #include "socket4_user_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/socket4_xif.cc xorp-1.6/xrl/interfaces/socket4_xif.cc
--- xorp-1.6.orig/xrl/interfaces/socket4_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/socket4_xif.cc	2011-02-26 14:58:03.308384901 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/socket4_xif.cc,v 1.28 2009/01/05 18:31:13 jtc Exp $"
 
 #include "socket4_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/socket6_user_xif.cc xorp-1.6/xrl/interfaces/socket6_user_xif.cc
--- xorp-1.6.orig/xrl/interfaces/socket6_user_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/socket6_user_xif.cc	2011-02-26 14:58:03.343894750 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/socket6_user_xif.cc,v 1.19 2009/01/05 18:31:13 jtc Exp $"
 
 #include "socket6_user_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/socket6_xif.cc xorp-1.6/xrl/interfaces/socket6_xif.cc
--- xorp-1.6.orig/xrl/interfaces/socket6_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/socket6_xif.cc	2011-02-26 14:58:03.395863652 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/socket6_xif.cc,v 1.27 2009/01/05 18:31:13 jtc Exp $"
 
 #include "socket6_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/static_routes_xif.cc xorp-1.6/xrl/interfaces/static_routes_xif.cc
--- xorp-1.6.orig/xrl/interfaces/static_routes_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/static_routes_xif.cc	2011-02-26 14:58:03.319870369 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/static_routes_xif.cc,v 1.19 2009/01/05 18:31:13 jtc Exp $"
 
 #include "static_routes_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/test_peer_xif.cc xorp-1.6/xrl/interfaces/test_peer_xif.cc
--- xorp-1.6.orig/xrl/interfaces/test_peer_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/test_peer_xif.cc	2011-02-26 14:58:03.363926498 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/test_peer_xif.cc,v 1.26 2009/01/05 18:31:13 jtc Exp $"
 
 #include "test_peer_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/test_xif.cc xorp-1.6/xrl/interfaces/test_xif.cc
--- xorp-1.6.orig/xrl/interfaces/test_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/test_xif.cc	2011-02-26 14:58:03.235937953 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/test_xif.cc,v 1.23 2009/01/05 18:31:13 jtc Exp $"
 
 #include "test_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/test_xrls_xif.cc xorp-1.6/xrl/interfaces/test_xrls_xif.cc
--- xorp-1.6.orig/xrl/interfaces/test_xrls_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/test_xrls_xif.cc	2011-02-26 14:58:03.432082225 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/test_xrls_xif.cc,v 1.15 2009/01/05 18:31:13 jtc Exp $"
 
 #include "test_xrls_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/vrrp_xif.cc xorp-1.6/xrl/interfaces/vrrp_xif.cc
--- xorp-1.6.orig/xrl/interfaces/vrrp_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/vrrp_xif.cc	2011-02-26 14:58:03.224363659 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/vrrp_xif.cc,v 1.2 2009/01/05 18:31:13 jtc Exp $"
 
 #include "vrrp_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/interfaces/xorp_if_mib_xif.cc xorp-1.6/xrl/interfaces/xorp_if_mib_xif.cc
--- xorp-1.6.orig/xrl/interfaces/xorp_if_mib_xif.cc	2009-01-05 13:31:13.000000000 -0500
+++ xorp-1.6/xrl/interfaces/xorp_if_mib_xif.cc	2011-02-26 14:58:03.423941137 -0500
@@ -8,7 +8,6 @@
  * Generated by 'clnt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/interfaces/xorp_if_mib_xif.cc,v 1.18 2009/01/05 18:31:13 jtc Exp $"
 
 #include "xorp_if_mib_xif.hh"
 
diff -rupN xorp-1.6.orig/xrl/targets/bgp4_mib_base.cc xorp-1.6/xrl/targets/bgp4_mib_base.cc
--- xorp-1.6.orig/xrl/targets/bgp4_mib_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/bgp4_mib_base.cc	2011-02-26 14:58:03.516329490 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/bgp4_mib_base.cc,v 1.24 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "bgp4_mib_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/bgp_base.cc xorp-1.6/xrl/targets/bgp_base.cc
--- xorp-1.6.orig/xrl/targets/bgp_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/bgp_base.cc	2011-02-26 14:58:03.492300245 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/bgp_base.cc,v 1.61 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "bgp_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/cli_base.cc xorp-1.6/xrl/targets/cli_base.cc
--- xorp-1.6.orig/xrl/targets/cli_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/cli_base.cc	2011-02-26 14:58:03.471971492 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/cli_base.cc,v 1.28 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "cli_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/coord_base.cc xorp-1.6/xrl/targets/coord_base.cc
--- xorp-1.6.orig/xrl/targets/coord_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/coord_base.cc	2011-02-26 14:58:03.467906857 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/coord_base.cc,v 1.27 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "coord_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/fea_base.cc xorp-1.6/xrl/targets/fea_base.cc
--- xorp-1.6.orig/xrl/targets/fea_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/fea_base.cc	2011-02-26 14:58:03.543859886 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/fea_base.cc,v 1.95 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "fea_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/fea_ifmgr_mirror_base.cc xorp-1.6/xrl/targets/fea_ifmgr_mirror_base.cc
--- xorp-1.6.orig/xrl/targets/fea_ifmgr_mirror_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/fea_ifmgr_mirror_base.cc	2011-02-26 14:58:03.519847061 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/fea_ifmgr_mirror_base.cc,v 1.33 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "fea_ifmgr_mirror_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/fib2mrib_base.cc xorp-1.6/xrl/targets/fib2mrib_base.cc
--- xorp-1.6.orig/xrl/targets/fib2mrib_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/fib2mrib_base.cc	2011-02-26 14:58:03.499881443 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/fib2mrib_base.cc,v 1.20 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "fib2mrib_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/finder_base.cc xorp-1.6/xrl/targets/finder_base.cc
--- xorp-1.6.orig/xrl/targets/finder_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/finder_base.cc	2011-02-26 14:58:03.639892422 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/finder_base.cc,v 1.33 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "finder_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/finder_client_base.cc xorp-1.6/xrl/targets/finder_client_base.cc
--- xorp-1.6.orig/xrl/targets/finder_client_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/finder_client_base.cc	2011-02-26 14:58:03.568644901 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/finder_client_base.cc,v 1.27 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "finder_client_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/mfea_base.cc xorp-1.6/xrl/targets/mfea_base.cc
--- xorp-1.6.orig/xrl/targets/mfea_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/mfea_base.cc	2011-02-26 14:58:03.648273822 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/mfea_base.cc,v 1.38 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "mfea_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/mld6igmp_base.cc xorp-1.6/xrl/targets/mld6igmp_base.cc
--- xorp-1.6.orig/xrl/targets/mld6igmp_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/mld6igmp_base.cc	2011-02-26 14:58:03.512550831 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/mld6igmp_base.cc,v 1.41 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "mld6igmp_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/olsr4_base.cc xorp-1.6/xrl/targets/olsr4_base.cc
--- xorp-1.6.orig/xrl/targets/olsr4_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/olsr4_base.cc	2011-02-26 14:58:03.635864319 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/olsr4_base.cc,v 1.6 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "olsr4_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/ospfv2_base.cc xorp-1.6/xrl/targets/ospfv2_base.cc
--- xorp-1.6.orig/xrl/targets/ospfv2_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/ospfv2_base.cc	2011-02-26 14:58:03.663868052 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/ospfv2_base.cc,v 1.39 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "ospfv2_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/ospfv3_base.cc xorp-1.6/xrl/targets/ospfv3_base.cc
--- xorp-1.6.orig/xrl/targets/ospfv3_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/ospfv3_base.cc	2011-02-26 14:58:03.559861827 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/ospfv3_base.cc,v 1.26 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "ospfv3_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/pim_base.cc xorp-1.6/xrl/targets/pim_base.cc
--- xorp-1.6.orig/xrl/targets/pim_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/pim_base.cc	2011-02-26 14:58:03.615887547 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/pim_base.cc,v 1.68 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "pim_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/policy_base.cc xorp-1.6/xrl/targets/policy_base.cc
--- xorp-1.6.orig/xrl/targets/policy_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/policy_base.cc	2011-02-26 14:58:03.503910903 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/policy_base.cc,v 1.23 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "policy_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/profiler_base.cc xorp-1.6/xrl/targets/profiler_base.cc
--- xorp-1.6.orig/xrl/targets/profiler_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/profiler_base.cc	2011-02-26 14:58:03.552645447 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/profiler_base.cc,v 1.14 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "profiler_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/rib_base.cc xorp-1.6/xrl/targets/rib_base.cc
--- xorp-1.6.orig/xrl/targets/rib_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/rib_base.cc	2011-02-26 14:58:03.584688018 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/rib_base.cc,v 1.47 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "rib_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/ribclient_base.cc xorp-1.6/xrl/targets/ribclient_base.cc
--- xorp-1.6.orig/xrl/targets/ribclient_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/ribclient_base.cc	2011-02-26 14:58:03.499881443 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/ribclient_base.cc,v 1.24 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "ribclient_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/rip_base.cc xorp-1.6/xrl/targets/rip_base.cc
--- xorp-1.6.orig/xrl/targets/rip_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/rip_base.cc	2011-02-26 14:58:03.547881068 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/rip_base.cc,v 1.40 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "rip_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/ripng_base.cc xorp-1.6/xrl/targets/ripng_base.cc
--- xorp-1.6.orig/xrl/targets/ripng_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/ripng_base.cc	2011-02-26 14:58:03.591857101 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/ripng_base.cc,v 1.40 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "ripng_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/rtrmgr_base.cc xorp-1.6/xrl/targets/rtrmgr_base.cc
--- xorp-1.6.orig/xrl/targets/rtrmgr_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/rtrmgr_base.cc	2011-02-26 14:58:03.624532466 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/rtrmgr_base.cc,v 1.30 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "rtrmgr_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/show_distances_base.cc xorp-1.6/xrl/targets/show_distances_base.cc
--- xorp-1.6.orig/xrl/targets/show_distances_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/show_distances_base.cc	2011-02-26 14:58:03.563871254 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/show_distances_base.cc,v 1.10 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "show_distances_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/show_routes_base.cc xorp-1.6/xrl/targets/show_routes_base.cc
--- xorp-1.6.orig/xrl/targets/show_routes_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/show_routes_base.cc	2011-02-26 14:58:03.495915256 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/show_routes_base.cc,v 1.18 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "show_routes_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/static_routes_base.cc xorp-1.6/xrl/targets/static_routes_base.cc
--- xorp-1.6.orig/xrl/targets/static_routes_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/static_routes_base.cc	2011-02-26 14:58:03.483864761 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/static_routes_base.cc,v 1.21 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "static_routes_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_base.cc xorp-1.6/xrl/targets/test_base.cc
--- xorp-1.6.orig/xrl/targets/test_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_base.cc	2011-02-26 14:58:03.575864623 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_base.cc,v 1.25 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_fea_ifmgr_mirror_base.cc xorp-1.6/xrl/targets/test_fea_ifmgr_mirror_base.cc
--- xorp-1.6.orig/xrl/targets/test_fea_ifmgr_mirror_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_fea_ifmgr_mirror_base.cc	2011-02-26 14:58:03.563871254 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_fea_ifmgr_mirror_base.cc,v 1.18 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_fea_ifmgr_mirror_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_fea_rawlink_base.cc xorp-1.6/xrl/targets/test_fea_rawlink_base.cc
--- xorp-1.6.orig/xrl/targets/test_fea_rawlink_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_fea_rawlink_base.cc	2011-02-26 14:58:03.619910029 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_fea_rawlink_base.cc,v 1.6 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_fea_rawlink_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_finder_events_base.cc xorp-1.6/xrl/targets/test_finder_events_base.cc
--- xorp-1.6.orig/xrl/targets/test_finder_events_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_finder_events_base.cc	2011-02-26 14:58:03.651896876 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_finder_events_base.cc,v 1.22 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_finder_events_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_peer_base.cc xorp-1.6/xrl/targets/test_peer_base.cc
--- xorp-1.6.orig/xrl/targets/test_peer_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_peer_base.cc	2011-02-26 14:58:03.644727746 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_peer_base.cc,v 1.28 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_peer_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_socket4_base.cc xorp-1.6/xrl/targets/test_socket4_base.cc
--- xorp-1.6.orig/xrl/targets/test_socket4_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_socket4_base.cc	2011-02-26 14:58:03.656430731 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_socket4_base.cc,v 1.19 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_socket4_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_socket6_base.cc xorp-1.6/xrl/targets/test_socket6_base.cc
--- xorp-1.6.orig/xrl/targets/test_socket6_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_socket6_base.cc	2011-02-26 14:58:03.523881781 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_socket6_base.cc,v 1.19 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_socket6_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/test_xrls_base.cc xorp-1.6/xrl/targets/test_xrls_base.cc
--- xorp-1.6.orig/xrl/targets/test_xrls_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/test_xrls_base.cc	2011-02-26 14:58:03.627879196 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/test_xrls_base.cc,v 1.15 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "test_xrls_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/vrrp_base.cc xorp-1.6/xrl/targets/vrrp_base.cc
--- xorp-1.6.orig/xrl/targets/vrrp_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/vrrp_base.cc	2011-02-26 14:58:03.659884009 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/vrrp_base.cc,v 1.2 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "vrrp_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/xorp_if_mib_base.cc xorp-1.6/xrl/targets/xorp_if_mib_base.cc
--- xorp-1.6.orig/xrl/targets/xorp_if_mib_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/xorp_if_mib_base.cc	2011-02-26 14:58:03.571859833 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/xorp_if_mib_base.cc,v 1.21 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "xorp_if_mib_base.hh"
diff -rupN xorp-1.6.orig/xrl/targets/xorpsh_base.cc xorp-1.6/xrl/targets/xorpsh_base.cc
--- xorp-1.6.orig/xrl/targets/xorpsh_base.cc	2009-01-05 13:31:15.000000000 -0500
+++ xorp-1.6/xrl/targets/xorpsh_base.cc	2011-02-26 14:58:03.475873162 -0500
@@ -8,7 +8,6 @@
  * Generated by 'tgt-gen'.
  */
 
-#ident "$XORP: xorp/xrl/targets/xorpsh_base.cc,v 1.27 2009/01/05 18:31:15 jtc Exp $"
 
 
 #include "xorpsh_base.hh"
diff -rupN xorp-1.6.orig/xrl/tests/test_generated.cc xorp-1.6/xrl/tests/test_generated.cc
--- xorp-1.6.orig/xrl/tests/test_generated.cc	2009-01-05 13:31:17.000000000 -0500
+++ xorp-1.6/xrl/tests/test_generated.cc	2011-02-26 14:58:03.467906857 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/xrl/tests/test_generated.cc,v 1.22 2009/01/05 18:31:17 jtc Exp $"
 
 #include "libxipc/ipc_module.h"
 
diff -rupN xorp-1.6.orig/xrl/tests/test_tgt.cc xorp-1.6/xrl/tests/test_tgt.cc
--- xorp-1.6.orig/xrl/tests/test_tgt.cc	2009-01-05 13:31:17.000000000 -0500
+++ xorp-1.6/xrl/tests/test_tgt.cc	2011-02-26 14:58:03.460297191 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/xrl/tests/test_tgt.cc,v 1.12 2009/01/05 18:31:17 jtc Exp $"
 
 #include <iostream>
 
diff -rupN xorp-1.6.orig/xrl/tests/test_xifs.cc xorp-1.6/xrl/tests/test_xifs.cc
--- xorp-1.6.orig/xrl/tests/test_xifs.cc	2009-01-05 13:31:17.000000000 -0500
+++ xorp-1.6/xrl/tests/test_xifs.cc	2011-02-26 14:58:03.464036595 -0500
@@ -18,7 +18,6 @@
 // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
 // http://xorp.net
 
-#ident "$XORP: xorp/xrl/tests/test_xifs.cc,v 1.10 2009/01/05 18:31:17 jtc Exp $"
 
 #include <iostream>