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

diff --cc bgpd/bgp_mpath.c
index 496ccdf11b9636a76369e44e85d493197ab651a1,f7b13f5278684735297b5f2a0266324baabe060b..50813df0346ed851827d4cc17ed77871ab577f25
--- 1/bgpd/bgp_mpath.c
--- 2/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@@ -427,9 -427,10 +427,10 @@@ bgp_info_mpath_update (struct bgp_node 
    struct bgp_info *cur_mpath, *new_mpath, *next_mpath, *prev_mpath;
    int mpath_changed, debug;
    char pfx_buf[PREFIX2STR_BUFFER], nh_buf[2][INET6_ADDRSTRLEN];
+   char path_buf[PATH_ADDPATH_STR_BUFFER];
  
    mpath_changed = 0;
 -  maxpaths = BGP_DEFAULT_MAXPATHS;
 +  maxpaths = MULTIPATH_NUM;
    mpath_count = 0;
    cur_mpath = NULL;
    old_mpath_count = 0;

diff --cc zebra/Makefile.am
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge