[shorewall/f14: 10/10] Merge branch 'master' into f14

[Jonathan G. Underwood]

commit 6284bdcfc1406dcdee33512fc87cdcc59589d740
Merge: ed6e931 af60e8b
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 01:34:36 2011 +0100

    Merge branch 'master' into f14

 .gitignore              |   10 +++
 shorewall-lite.service  |   16 ++++
 shorewall.service       |   16 ++++
 shorewall.spec          |  196 ++++++++++++++++-------------------------------
 shorewall6-lite.service |   16 ++++
 shorewall6.service      |   16 ++++
 sources                 |   10 +-
 7 files changed, 145 insertions(+), 135 deletions(-)
---