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

[smilner]

commit c3b5f64229637849b6d20393306480ab6e07b60c
Merge: 290d106 34e40fb
Author: Steve Milner <stevem at gnulinux.net>
Date:   Wed Jul 27 11:44:46 2011 -0400

    Merge branch 'master' into el6

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