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

[Peter Lemenkov]

commit f824316cb907606a0251553cf456cbc413b32d88
Merge: 1d91a07 c1423e8
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jun 5 19:08:59 2012 +0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	erlang-erlsyslog.spec
    	sources

 .gitignore            |    2 +
 erlang-erlsyslog.spec |   52 ++++++++++++++++++++++++++++++++-----------------
 sources               |    2 +-
 3 files changed, 37 insertions(+), 19 deletions(-)
---