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

[Jonathan G. Underwood]

commit c7a8cb1a976f4bc8cba9e73e70761fcfc6c6f699
Merge: 88e9cf9 2c41741
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Sat Jul 23 19:19:37 2011 +0100

    Merge branch 'f15' into el5

 shorewall.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---