Merge commit '2b3d52aa421ae1c31e30107beefd82fddbb42854' into integrated

diff --cc configure.in
Simple merge

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

diff --cc sysdep/config.h
index 0b96c707a31f67d7be0296fc245e25e7e7b0c570,914c10908d9fa157065f9cf78713d9e5f345c3fa..a75780273d1998de35b385a048bf2fc40c1346f2
--- 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.11"
+ #define BIRD_VERSION "1.3.12"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"