Merge commit '60880b539b8886f76961125d89a265c6e1112b7a' into haugesund

diff --cc nest/route.h
Simple merge

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

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

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

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

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