[firehol/el6: 10/10] Merge branch 'el5' into el6

[Susi Lehtola]

commit 07000d35e9fd306e4d6e937fc109968a64a85ebc
Merge: 9ec6361 5c418c6
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Wed Apr 17 11:31:25 2013 +0300

    Merge branch 'el5' into el6

 .gitignore   |    1 -
 firehol.spec |   22 +++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)
---