[firehol/el5: 2/2] Merge branch 'master' into el5

[Jussi Lehtola]

commit f1da5d4ddfbeb2a553a0d900d870d3f319580c06
Merge: b4d0ec3 a818966
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Oct 2 23:24:00 2012 +0300

    Merge branch 'master' into el5

 firehol-1.273-getiana.patch |   22 +++++++++++-----------
 firehol.spec                |    5 ++++-
 2 files changed, 15 insertions(+), 12 deletions(-)
---