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

diff --cc zebra/connected.c
index 98e0bb84afb2eab237542272c331c6209ef241d0,b9ab3e13b58004556ef7b3f27198a256a92f5a36..41b68d1564a2e24f8a7287960650470324527f74
--- 1/zebra/connected.c
--- 2/zebra/connected.c
+++ b/zebra/connected.c
@@@ -392,11 -348,9 +348,9 @@@ connected_delete_ipv4 (struct interfac
    if (! ifc)
      return;
  
-   connected_delete_ipv4_unnumbered (ifc);
- 
    connected_withdraw (ifc);
  
 -  if (IS_ZEBRA_DEBUG_RIB)
 +  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
      zlog_debug ("%s: calling rib_update_static", __func__);
  
    rib_update_static(ifp->vrf_id);

diff --cc zebra/interface.c
Simple merge