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

[Jonathan G. Underwood]

commit 41504c008da76bbd5671188dded9998c8fbc42e7
Merge: 6284bdc 7637bfb
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 01:44:31 2011 +0100

    Merge branch 'master' into f14

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