Merge commit '4a23ede2b056a41456790cc20a0c3d92a7137693' into haugesund

diff --cc filter/f-inst.c
Simple merge

diff --cc nest/proto.c
Simple merge

diff --cc nest/protocol.h
Simple merge

diff --cc nest/route.h
Simple merge

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

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

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

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

diff --cc proto/bgp/bgp.h
Simple merge

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/perf/perf.c
Simple merge

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

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

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

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

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

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