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

[Jonathan G. Underwood]

commit bd158e1305a78aa98378c4d29bdfe2d18b9ad7e4
Merge: 5144f7b 7637bfb
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 01:46:31 2011 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	shorewall.spec

 shorewall.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---