Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated

Conflicts:

	sysdep/linux/netlink.c

diff --cc conf/conf.c
Simple merge

diff --cc filter/filter.h
Simple merge

diff --cc nest/proto.c
Simple merge

diff --cc proto/ospf/iface.c
Simple merge

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/config.h
index a75780273d1998de35b385a048bf2fc40c1346f2,eb5606acc5a42b11a4c912f8ef8d3b08a565b342..2b668d0c763e43a3ef21ee9f4e6dfa193676c753
--- 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.3.12"
+ #define BIRD_VERSION "1.4.0"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"
  

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

diff --cc sysdep/unix/krt.h
Simple merge