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

[Jonathan G. Underwood]

commit 1699df867ee19cec66ffb4a1e49a016a796b4f5a
Merge: 93c6b51 49baea0
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 15:34:16 2011 +0100

    Merge branch 'master' into el6

 shorewall.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---