[firehol/el6: 8/8] Merge branch 'master' into el6

[Jussi Lehtola]

commit 16ca80dabddfd72468d906cdec033f8d62a18cf7
Merge: fdd6ab6 1769bd8
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Oct 2 23:01:20 2012 +0300

    Merge branch 'master' into el6

 firehol-1.273-getiana.patch |  278 +++++++++++++++++++++++++++++++++++++++++++
 firehol.spec                |   22 +++-
 2 files changed, 298 insertions(+), 2 deletions(-)
---