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

[Jonathan G. Underwood]

commit c156f3c878af3080ec885fb4815e5d531fe14aba
Merge: 7b90cad 4104d92
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Mon Aug 22 16:27:39 2011 +0100

    Merge branch 'f15' into el5

 shorewall.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---