[netstat-nat/el5/master: 6/6] Merge branch 'master' into el5

[nucleo]

commit 0090fa67f17f800a6b31cff2f1df3a778128dcd4
Merge: 3d8c677 b38e325
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Jan 7 03:00:33 2011 +0200

    Merge branch 'master' into el5

 .gitignore       |    1 +
 netstat-nat.spec |   11 +++++++++--
 sources          |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---