Merge remote branch 'qpimd/pim' into merged/pimd

Conflicts:
	configure.ac
	lib/zebra.h
	vtysh/vtysh.c

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/log.h b/lib/log.h
index 2dd1d313..185bcee8 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -3,6 +3,7 @@
  *
  * Zebra logging funcions.
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
+ * Portions Copyright (c) 2008 Everton da Silva Marques <everton.marques@gmail.com>
  *
  * This file is part of GNU Zebra.
  *
@@ -54,6 +55,7 @@ typedef enum
   ZLOG_RIPNG,  
   ZLOG_OSPF6,
   ZLOG_ISIS,
+  ZLOG_PIM,
   ZLOG_MASC
 } zlog_proto_t;