Merge commit 'd39ef961d1dde230c55fcc931b53f44cb34a1e63' into haugesund

diff --cc nest/rt-table.c
Simple merge

diff --cc proto/bgp/attrs.c
index f4f7d15a5981829e6b5620fea8d878054cb6a78a,a7c49be592e4baba7776100d7211a8ba11e2d3d5..9f31c28bb50f52bc98bf1bb078410a112551741b
--- 1/proto/bgp/attrs.c
--- 2/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -2079,9 -2078,13 +2078,13 @@@ bgp_rte_mergable(rte *pri, rte *sec
      return 0;
  
    /* RFC 4271 9.1.2.1. Route resolvability test */
 -  if (rte_resolvable(pri) != rte_resolvable(sec))
 +  if (rta_resolvable(pri->attrs) != rta_resolvable(sec->attrs))
      return 0;
  
+   /* LLGR draft - depreference stale routes */
+   if (rte_stale(pri) != rte_stale(sec))
+     return 0;
+ 
    /* Start with local preferences */
    x = ea_find(pri->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));
    y = ea_find(sec->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));

diff --cc proto/bgp/packets.c
Simple merge

diff --cc proto/mrt/mrt.c
Simple merge

diff --cc proto/ospf/ospf.c
Simple merge

diff --cc proto/static/static.c
Simple merge