RSM

.......... [RSM-1] updated to version pre-5.0.0beta1 by merging from Zabbix upstream; conflicts resolved:

create/src/data.tmpl
create/src/schema.tmpl
create/src/templates.tmpl
frontends/php/app/controllers/CControllerTimeSelectorUpdate.php
frontends/php/app/controllers/CControllerUserCreate.php
frontends/php/app/controllers/CControllerUserProfileEdit.php
frontends/php/app/controllers/CControllerUserProfileUpdate.php
frontends/php/app/views/layout.htmlpage.php
frontends/php/auditlogs.php
frontends/php/include/audit.inc.php
frontends/php/include/classes/mvc/CRouter.php
frontends/php/include/defines.inc.php
frontends/php/include/menu.inc.php
frontends/php/include/page_header.php
frontends/php/js/class.csuggest.js
frontends/php/js/main.js
src/Makefile.am
src/libs/zbxdbupgrade/dbupgrade_4050.c
src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
src/zabbix_server/poller/poller.c