Index: stable/9/lib/libbsnmp/Makefile.inc
===================================================================
--- stable/9/lib/libbsnmp/Makefile.inc	(revision 301673)
+++ stable/9/lib/libbsnmp/Makefile.inc	(revision 301674)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-NO_WERROR=
 INCSDIR=	${INCLUDEDIR}/bsnmp
 
 .include "../Makefile.inc"
Index: stable/9/lib
===================================================================
--- stable/9/lib	(revision 301673)
+++ stable/9/lib	(revision 301674)

Property changes on: stable/9/lib
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/lib:r301673
Index: stable/9
===================================================================
--- stable/9	(revision 301673)
+++ stable/9	(revision 301674)

Property changes on: stable/9
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r299699
   Merged /stable/10:r301673