Merge commit 'f8e8fcfabeb206287065f48e800743b0aa797cc2' into integrated

Conflicts:

	conf/confbase.Y

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

diff --cc conf/confbase.Y
index bcee76d54572ead91e2a589dde09cf335aa67480,c6678e77dbb2b94e2610fd4c56323271c182844c..7a9cfa615058e5ee9dbc8c4a41783e7b24cb4851
--- 1/conf/confbase.Y
--- 2/conf/confbase.Y
+++ b/conf/confbase.Y
@@@ -140,18 -138,12 +141,18 @@@ bool
   ;
  
  /* Addresses, prefixes and netmasks */
 +// XXXX check users
 +
 +ipa_raw:
 +   IP4 { $$ = ipa_from_ip4($1); }
 + | IP6 { $$ = ipa_from_ip6($1); }
 + ;
  
  ipa:
 -   IPA
 +   ipa_raw
   | SYM {
-      if ($1->class != SYM_IPA) cf_error("IP address expected");
-      $$ = *(ip_addr *)$1->def;
+      if ($1->class != (SYM_CONSTANT | T_IP)) cf_error("IP address expected");
+      $$ = SYM_VAL($1).px.ip;
     }
   ;
  

diff --cc filter/config.Y
Simple merge

diff --cc sysdep/config.h
index 18423cdde300ece8a0448557dcd0f90897677909,7bfb05d6d7a351fea0ebd3c72d2bba96d9367557..218ab3bb61f4bb9526ffd92359896b56938fe32e
--- 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.10"
+ #define BIRD_VERSION "1.3.11"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"