[erlang-erlsyslog/el5: 2/2] Merge branch 'master' into el5