* bgp_clist.[ch], bgp_route.c, bgp_routemap.c, bgp_vty.c:
	  community-list cleanup.

	[merge from GNU Zebra]
diff --git a/bgpd/bgp_clist.h b/bgpd/bgp_clist.h
index 11db2d7..6f1faf0 100644
--- a/bgpd/bgp_clist.h
+++ b/bgpd/bgp_clist.h
@@ -18,6 +18,10 @@
 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
+/* Master Community-list. */
+#define COMMUNITY_LIST_MASTER          0
+#define EXTCOMMUNITY_LIST_MASTER       1
+
 /* Community-list deny and permit.  */
 #define COMMUNITY_DENY                 0
 #define COMMUNITY_PERMIT               1
@@ -29,10 +33,8 @@
 /* Community-list entry types.  */
 #define COMMUNITY_LIST_STANDARD        0 /* Standard community-list.  */
 #define COMMUNITY_LIST_EXPANDED        1 /* Expanded community-list.  */
-#define COMMUNITY_LIST_AUTO            2 /* Automatically detected.  */
-#define EXTCOMMUNITY_LIST_STANDARD     3 /* Standard extcommunity-list.  */
-#define EXTCOMMUNITY_LIST_EXPANDED     4 /* Expanded extcommunity-list.  */
-#define EXTCOMMUNITY_LIST_AUTO         5 /* Automatically detected.  */
+#define EXTCOMMUNITY_LIST_STANDARD     2 /* Standard extcommunity-list.  */
+#define EXTCOMMUNITY_LIST_EXPANDED     3 /* Expanded extcommunity-list.  */
 
 /* Community-list.  */
 struct community_list