Merge commit 'a2017200c71293d0a28a39d1f250ba38d57f6289' into integrated

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

diff --cc sysdep/config.h
index 6e446547e0f2cb1c38c7ae9f8a55d90a649da77d,3b83d5585e1506d05d362487a71fdfeafbfac59f..18423cdde300ece8a0448557dcd0f90897677909
--- 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.9"
+ #define BIRD_VERSION "1.3.10"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"