Merge commit '231c6385' into thread-next-iface

diff --cc doc/bird.sgml
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc sysdep/unix/main.c
index 79db32d32218e55ffc6675c607446fed3b18b0eb,0d3ec0c07b500ec1b5b39334c4e18feed94bb05b..0337c75590cb5f0383de27b89f2017a1672563ca
--- 1/sysdep/unix/main.c
--- 2/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@@ -897,15 -888,12 +897,14 @@@ main(int argc, char **argv
    parse_args(argc, argv);
    log_switch(1, NULL, NULL);
  
 +  the_bird_lock();
 +
    random_init();
-   net_init();
    resource_init();
 -  timer_init();
 +  birdloop_init();
    olock_init();
 -  io_init();
    rt_init();
 +  io_init();
    if_init();
  //  roa_init();
    config_init();