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

[Jonathan G. Underwood]

commit ed6e93154ba312cfd8049f1c608abbb87fefa1aa
Merge: 0d60e1b acde3c5
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Sat Mar 5 14:09:32 2011 +0000

    Merge branch 'master' into f14

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