Merge 0.7->trunk

diff --cc plugins/mod_posix.lua
Simple merge

diff --cc prosody
index e4e821050d60829c9b8c652d33e003ec7bde470c,8e96eb46ac88d1cfdc42bf146a0570928686bd17..88620b38fc8efa7ae7ff1e79c600de44957b38f9
--- 1/prosody
--- 2/prosody
+++ b/prosody
@@@ -335,9 -324,8 +328,8 @@@ function init_data_store(
  end
  
  function prepare_to_start()
 -      log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
 +      log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
        -- Signal to modules that we are ready to start
-       eventmanager.fire_event("server-starting");
        prosody.events.fire_event("server-starting");
  
        -- start listening on sockets