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

[Jonathan G. Underwood]

commit 8f7f94f87ebb17ba32621813e381df30b6a3577a
Merge: 0069d2b acde3c5
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Sat Mar 5 14:10:16 2011 +0000

    Merge branch 'master' into el6

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