[shorewall/el5: 2/2] Merge branch 'f15' into el5

[Jonathan G. Underwood]

commit 3b164d95e4b0367c95d138b26ed1d79528d7adc9
Merge: 34766fe 0033eca
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Sat Aug 20 18:56:33 2011 +0100

    Merge branch 'f15' into el5

 .gitignore              |    5 ++
 shorewall-ALL.patch     |   13 ------
 shorewall-qtnoin.patch  |   99 -----------------------------------------------
 shorewall.spec          |   21 +++-------
 shorewall6-qtnoin.patch |   27 -------------
 sources                 |   10 ++--
 6 files changed, 16 insertions(+), 159 deletions(-)
---