Merge branch 'master' into int-new

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

diff --cc conf/conf.c
Simple merge

diff --cc conf/conf.h
index 4b245e0003eb11ab6248aec909f08d2da70c514e,bf74b76b1a4479a74afdc6675f43c097c2be47c4..af92f056b8f7fe1d1d7c228326be1fd856737495
--- 1/conf/conf.h
--- 2/conf/conf.h
+++ b/conf/conf.h
@@@ -9,10 -9,9 +9,11 @@@
  #ifndef _BIRD_CONF_H_
  #define _BIRD_CONF_H_
  
 -#include "lib/resource.h"
 -#include "lib/timer.h"
 +#include "sysdep/config.h"
 +#include "lib/ip.h"
+ #include "lib/hash.h"
 +#include "lib/resource.h"
 +#include "sysdep/unix/timer.h"
  
  
  /* Configuration structure */

diff --cc nest/cmds.c
Simple merge