Merge pull request #762 from bingen/mutiple_nh_recursive_levels

Allow for more than 1 NH recursion level

diff --cc zebra/redistribute.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zebra_rnh.c
Simple merge

diff --cc zebra/zebra_vty.c
index 1b393830825392d9d5f19ddaaf4cf9a292460c94,3b138cba8be1c048794ef89577a923ea635b4696..363c31283fc8e6947df6d52c800081b88952bae7
--- 1/zebra/zebra_vty.c
--- 2/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@@ -709,11 -716,11 +708,11 @@@ vty_show_ip_route_detail (struct vty *v
            vty_out (vty, "%02dw%dd%02dh",
                     tm->tm_yday/7,
                     tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour);
 -        vty_out (vty, " ago%s", VTY_NEWLINE);
 +        vty_out (vty, " ago%s", VTYNL);
        }
  
-       for (ALL_NEXTHOPS_RO(re->nexthop, nexthop, tnexthop, recursing))
-       {
+       for (ALL_NEXTHOPS(re->nexthop, nexthop))
+         {
            char addrstr[32];
  
          vty_out (vty, "  %c%s",