Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated

diff --cc conf/cf-lex.l
Simple merge

diff --cc conf/conf.c
Simple merge

diff --cc nest/config.Y
Simple merge

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

diff --cc proto/ospf/config.Y
index 40b14c4fa9674845148dfc25789f58afff34be02,90f289d083c6b04fdea6e3bf0f04ea143aa4e54c..99031c0b29b02f4ddce55eae8db9febd5a95de49
--- 1/proto/ospf/config.Y
--- 2/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@@ -373,12 -383,13 +373,16 @@@ ospf_iface_start
  
  ospf_instance_id:
     /* empty */
 - | INSTANCE expr { set_instance_id($2); }
 + | INSTANCE expr {
 +     if (ospf_cfg_is_v2()) cf_error("Instance ID requires OSPFv3");
 +     OSPF_PATT->instance_id = $2;
 +   }
   ;
  
+ ospf_iface_patt_list:
+    iface_patt_list { if (OSPF_VERSION == 3) iface_patt_check(); } ospf_instance_id
+  ; 
+ 
  ospf_iface_opts:
     /* empty */
   | ospf_iface_opts ospf_iface_item ';'

diff --cc proto/rip/config.Y
Simple merge

diff --cc sysdep/config.h
index 2b668d0c763e43a3ef21ee9f4e6dfa193676c753,b4aa75281cf273bef965ee7d948bd267a0dc9d8e..a32f6cfa978a52c8b3f46ed5d22ff0b263c59a1c
--- 1/sysdep/config.h
--- 2/sysdep/config.h
+++ b/sysdep/config.h
@@@ -7,11 -7,8 +7,11 @@@
  #define _BIRD_CONFIG_H_
  
  /* BIRD version */
- #define BIRD_VERSION "1.4.0"
+ #define BIRD_VERSION "1.4.2"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"
  

diff --cc sysdep/linux/sysio.h
Simple merge