[ncrack/el5: 3/3] Merge branch 'master' into el5

[smilner]

commit 378a25a747d98acb14c68e85c5f6e00355c5e93c
Merge: d4e60b3 34e40fb
Author: Steve Milner <stevem at gnulinux.net>
Date:   Wed Jul 27 11:52:41 2011 -0400

    Merge branch 'master' into el5

 .gitignore  |    1 +
 ncrack.spec |   27 +++++++++++++++++----------
 sources     |    2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)
---