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

[Jonathan G. Underwood]

commit 88e9cf9052b4c8ff9b396b1e9cf1d4674d89ebc7
Merge: bd158e1 49baea0
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 15:34:40 2011 +0100

    Merge branch 'master' into el5

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