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

[smilner]

commit faa7b636d060dec92009c354ef76e5c1d71c86e3
Merge: 332bb47 d88d5d1
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Fri Sep 10 15:36:41 2010 -0400

    Merge branch 'master' into f12

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