Merge branch 'master' into mrtdump

diff --cc doc/bird.sgml
Simple merge

diff --cc lib/birdlib.h
Simple merge

diff --cc lib/bitops.h
Simple merge

diff --cc lib/string.h
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc nest/route.h
Simple merge

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

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

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