Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

diff --cc zebra/rib.h
index 4d5ccac6063474c17f3530d0c87b0be06259b33d,bb2c084c47ef2fea6beaf3209a99ad4360ef7da8..285994c01519a438404b64a99644b6b1bcdc84d0
--- 1/zebra/rib.h
--- 2/zebra/rib.h
+++ b/zebra/rib.h
@@@ -371,16 -370,7 +370,15 @@@ typedef struct rib_tables_iter_t
    rib_tables_iter_state_t state;
  } rib_tables_iter_t;
  
 +/* Events/reasons triggering a RIB update. */
 +typedef enum
 +{
 +  RIB_UPDATE_IF_CHANGE,
 +  RIB_UPDATE_RMAP_CHANGE,
 +  RIB_UPDATE_OTHER
 +} rib_update_event_t;
 +
  extern struct nexthop *rib_nexthop_ifindex_add (struct rib *, unsigned int);
- extern struct nexthop *rib_nexthop_ifname_add (struct rib *, char *);
  extern struct nexthop *rib_nexthop_blackhole_add (struct rib *);
  extern struct nexthop *rib_nexthop_ipv4_add (struct rib *, struct in_addr *,
                                             struct in_addr *);

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_routemap.c
Simple merge