Merge commit 'a0b176e3b2b50d3a30574afa927e0ee8ef65be68' into integrated

diff --cc nest/proto.c
Simple merge

diff --cc nest/route.h
index f515b6e66771547f8a3c4d8ac69e67f40ac7853b,35b5fa19335ff195ad09f04f3a7f787d646f3230..b5dd7fb0d753e6c96e8794ac7504bf21a28054a5
--- 1/nest/route.h
--- 2/nest/route.h
+++ b/nest/route.h
@@@ -307,12 -265,8 +307,11 @@@ void rt_dump(rtable *)
  void rt_dump_all(void);
  int rt_feed_baby(struct proto *p);
  void rt_feed_baby_abort(struct proto *p);
- void rt_schedule_prune_all(void);
  int rt_prune_loop(void);
 -struct rtable_config *rt_new_table(struct symbol *s);
 +struct rtable_config *rt_new_table(struct symbol *s, int addr_type);
 +static inline int rt_match(int rt, u32 rtlist) { return !rtlist || ((1 << rt)  & rtlist); }
 +int rt_addrsize(int addr_type); // XXXX needed?
 +
  
  struct rt_show_data {
    ip_addr prefix;

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

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

diff --cc sysdep/unix/io.c
Simple merge