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

[Jonathan G. Underwood]

commit fd28c65af8e4de2ea03953ad3b29137929ac0b68
Merge: cc4e7bb 83428e5
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Mon Aug 22 15:55:00 2011 +0100

    Merge branch 'f15' into f14

 shorewall.spec |  102 +++++++++++++++++++++++++------------------------------
 1 files changed, 46 insertions(+), 56 deletions(-)
---