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

[Jonathan G. Underwood]

commit 93c6b5186a8fb6028d9d8e4b7833377d829e4250
Merge: 317ab74 7637bfb
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 01:44:54 2011 +0100

    Merge branch 'master' into el6

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