Merge commit 'ee919658' into thread-next-iface

diff --cc doc/bird.sgml
Simple merge

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

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

diff --cc proto/babel/config.Y
index a4350eed84af9106ad4ee666cb2093fcdae23708,1b4dc6f5f6c53b8ce4774fb0dc4f7656f569ae9a..6d1ad7d0f39eb9411084236a613a5e4438632e38
--- 1/proto/babel/config.Y
--- 2/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@@ -24,8 -24,9 +24,9 @@@ CF_DECL
  
  CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
        TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
 -      NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS,
 +      NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS,
-       ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE)
+       ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE,
+       EXTENDED)
  
  CF_GRAMMAR
  

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