Merge branch 'master' into vrf_stuff

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc eigrpd/eigrp_dump.c
index 3de7a53c103ea02d6bcbdaba38c90c67c51ccaf1,010f201cd556c7794ffab5d1458a5988a4d65531..5c15f26d7ff43c02a21e0380101fc4f27455e74b
--- 1/eigrpd/eigrp_dump.c
--- 2/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@@ -310,15 -310,10 +310,16 @@@ show_ip_eigrp_topology_header (struct v
  void
  show_ip_eigrp_prefix_entry (struct vty *vty, struct eigrp_prefix_entry *tn)
  {
 +  struct list *successors = eigrp_topology_get_successor(tn);
 +
    vty_out (vty, "%-3c",(tn->state > 0) ? 'A' : 'P');
 -  vty_out (vty, "%s/%u, ",inet_ntoa (tn->destination_ipv4->prefix),tn->destination_ipv4->prefixlen);
 -  vty_out (vty, "%u successors, ",eigrp_topology_get_successor(tn)->count);
 -  vty_out (vty, "FD is %u, serno: %" PRIu64 " %s",tn->fdistance, tn->serno, VTY_NEWLINE);
++
 +  vty_out (vty, "%s/%u, ",
 +         inet_ntoa (tn->destination_ipv4->prefix), tn->destination_ipv4->prefixlen);
 +  vty_out (vty, "%u successors, ", successors->count);
-   vty_out (vty, "FD is %u, serno: %lu %s", tn->fdistance, tn->serno, VTY_NEWLINE);
++  vty_out (vty, "FD is %u, serno: %" PRIu64 " %s", tn->fdistance, tn->serno, VTY_NEWLINE);
 +
 +  list_delete(successors);
  }
  
  void

diff --cc eigrpd/eigrp_update.c
Simple merge

diff --cc lib/Makefile.am
Simple merge