merge stuff

diff --cc update_daemon2.php
index 4d2eed5d99b930258cdb68d98c387ce71cd8fd8b,e7b5aeb202d948fff592b882aee7caa75ad52431..cf25eeac205e0ede4ef5c1388369b444b15c4778
--- 1/update_daemon2.php
--- 2/update_daemon2.php
+++ b/update_daemon2.php
@@@ -85,11 -85,11 +85,6 @@@
                        "Maybe another daemon is already running.\n");
        }
  
--      if (file_is_locked("update_daemon.lock")) {
--              die("error: Can't create lockfile. ".
--                      "Maybe another daemon is already running.\n");
--      }
--
        if (!pcntl_fork()) {
                pcntl_signal(SIGINT, 'sigint_handler');
  
@@@ -277,7 -284,7 +272,7 @@@
                                        if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
  
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
--
++ 
                                        db_close($link);
  
                                        // We are in a fork.