[erlang-erlsyslog/el6: 9/9] Merge branch 'master' into el6

[Peter Lemenkov]

commit 977840c80387abc4d81c0f25aad58618002f1930
Merge: f8d9638 c1423e8
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jun 5 19:06:50 2012 +0400

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

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