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

[smilner]

commit 290d106b1cbaafa03f7d6e37e9f5307450fc5e48
Merge: 0830fa2 d88d5d1
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Fri Sep 10 14:37:11 2010 -0400

    Merge branch 'master' into el6

 .gitignore  |    3 ++-
 ncrack.spec |   14 +++++++++++---
 sources     |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---