Merge commit 'dff90f5' into mq-tmp-babel

diff --cc doc/bird.sgml
Simple merge

diff --cc proto/radv/config.Y
index e8c8f67c2e4ba19e9067381f9eb5425ddc3029a4,cd54f10ccf7bc989f4cb1b394b1b84974c379212..372081d2852482a86b6a73df9630ba9ffece984b
--- 1/proto/radv/config.Y
--- 2/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@@ -42,7 -42,7 +42,7 @@@ CF_KEYWORDS(RADV, PREFIX, INTERFACE, MI
        RETRANS, TIMER, CURRENT, HOP, LIMIT, DEFAULT, VALID, PREFERRED, MULT,
        LIFETIME, SKIP, ONLINK, AUTONOMOUS, RDNSS, DNSSL, NS, DOMAIN, LOCAL,
        TRIGGER, SENSITIVE, PREFERENCE, LOW, MEDIUM, HIGH, PROPAGATE, ROUTE,
-       ROUTES, CUSTOM, OPTION, TYPE, VALUE)
 -      ROUTES, RA_PREFERENCE, RA_LIFETIME, CUSTOM, OPTION, TYPE, VALUE, PD)
++      ROUTES, CUSTOM, OPTION, TYPE, VALUE, PD)
  
  CF_ENUM(T_ENUM_RA_PREFERENCE, RA_PREF_, LOW, MEDIUM, HIGH)
  

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

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