Merge branch 'oz-trie-table'

doc/bird.sgml

filter/data.h

filter/test.conf

filter/trie.c

filter/trie_test.c

lib/birdlib.h

lib/ip.h

lib/ip_test.c

lib/net.h

nest/config.Y

nest/route.h

nest/rt-fib.c

nest/rt-show.c

nest/rt-table.c

proto/babel/babel.c

proto/bgp/attrs.c

proto/bgp/bgp.c

proto/bgp/bgp.h

proto/bgp/config.Y

proto/bgp/packets.c