Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/protocols,v
rcsdiff: /ftp/cvs/cvsroot/src/etc/protocols,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- src/etc/protocols	2005/12/18 21:39:52	1.14
+++ src/etc/protocols	2006/05/18 09:05:49	1.15
@@ -1,4 +1,4 @@
-#	$NetBSD: protocols,v 1.14 2005/12/18 21:39:52 rpaulo Exp $
+#	$NetBSD: protocols,v 1.15 2006/05/18 09:05:49 liamjfoy Exp $
 #
 # Internet (IP) protocols
 #
@@ -117,7 +117,7 @@ ipcomp	108	IPCOMP		# IP Payload Compress
 snp	109	SNP		# Sitara Networks Protocol
 compaq-peer	110	Compaq-Peer	# Compaq Peer Protocol
 ipx-in-ip	111	IPX-in-IP	# IPX in IP
-vrrp	112	VRRP		# Virtual Router Redundancy Protocol
+carp	112	CARP	vrrp	# Virtual Router Redundancy Protocol
 pgm	113	PGM		# PGM Reliable Transport Protocol
 #	114			# any 0-hop protocol
 l2tp	115	L2TP		# Layer Two Tunneling Protocol