Merge commit 'de86040b2cf4ec9bfbb64f0e208a19d4d7e51adc' into haugesund

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

diff --cc lib/route.h
Simple merge

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

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

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