Merge branch 'master' into working/master/patch-set/4-misc-fixes

Merged pull request with master

Conflicts:
	bgpd/bgp_mplsvpn.c
	bgpd/bgp_route.c
	bgpd/rfapi/rfapi_vty.c

diff --cc bgpd/bgp_encap.c
Simple merge

diff --cc bgpd/bgp_mplsvpn.h
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_route.h
index 21ca64091c24d78a8c525d752f2e7861da3c4d9d,3c7aa83a0e4da84276c201ad8c79a54c796cec24..83954beaea14840b77ed356acaf421a1d6d721f8
--- 1/bgpd/bgp_route.h
--- 2/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@@ -241,27 -241,6 +241,30 @@@ bgp_bump_version (struct bgp_node *node
    node->version = bgp_table_next_version(bgp_node_table(node));
  }
  
 +enum bgp_show_type
 +{
 +  bgp_show_type_normal,
 +  bgp_show_type_regexp,
 +  bgp_show_type_prefix_list,
 +  bgp_show_type_filter_list,
 +  bgp_show_type_route_map,
 +  bgp_show_type_neighbor,
 +  bgp_show_type_cidr_only,
 +  bgp_show_type_prefix_longer,
 +  bgp_show_type_community_all,
 +  bgp_show_type_community,
 +  bgp_show_type_community_exact,
 +  bgp_show_type_community_list,
 +  bgp_show_type_community_list_exact,
++  bgp_show_type_lcommunity_all,
++  bgp_show_type_lcommunity,
++  bgp_show_type_lcommunity_list,
 +  bgp_show_type_flap_statistics,
 +  bgp_show_type_flap_neighbor,
 +  bgp_show_type_dampend_paths,
 +  bgp_show_type_damp_neighbor
 +};
 +
  /* Prototypes. */
  extern void bgp_process_queue_init (void);
  extern void bgp_route_init (void);

diff --cc bgpd/rfapi/rfapi.c
Simple merge

diff --cc bgpd/rfapi/rfapi_import.c
Simple merge

diff --cc bgpd/rfapi/rfapi_private.h
Simple merge