Merge commit '4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6' into integrated

diff --cc nest/proto.c
Simple merge

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

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