Merge remote-tracking branch 'origin/stg-2.409' into ticket26

diff --cc projects/stargazer/main.cpp
Simple merge

diff --cc projects/stargazer/plugin_mgr.cpp
Simple merge

diff --cc projects/stargazer/plugin_mgr.h
index 0330f4e8c326107494d25e953991348feb927d4c,c9ec8dff3c63412e805677c22d232bbab947b197..a37052d5d1ab8397dde03d2fb043159b10b9fe88
--- 1/projects/stargazer/plugin_mgr.h
--- 2/projects/stargazer/plugin_mgr.h
+++ b/projects/stargazer/plugin_mgr.h
@@@ -48,7 -48,8 +48,8 @@@ class PluginManage
                        USERS_IMPL& users, TRAFFCOUNTER_IMPL& traffcounter);
          ~PluginManager();
  
 -        void reload();
 +        void reload(const SETTINGS_IMPL& settings);
+         void stop();
  
      private:
          std::vector<PLUGIN_RUNNER*> m_modules;

diff --cc projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
Simple merge

diff --cc projects/stargazer/plugins/other/rscript/rscript.cpp
Simple merge

diff --cc projects/stargazer/plugins/other/smux/smux.cpp
Simple merge