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

[Jonathan G. Underwood]

commit 0fa5fae0ab745fca3c929007c660d74ef5c50eaf
Merge: 68fd0b6 0033eca
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Sat Aug 20 18:56:06 2011 +0100

    Merge branch 'f15' into el6

 .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(-)
---