[perl-NTLM/el5: 4/4] Merge branch 'master' into el5

[Nick Bebout]

commit 41b54ae42bf96f8010374a157bc89d2e1ab1483d
Merge: 33e1103 7f80961
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 8 21:24:30 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-NTLM.spec
    	sources

 .gitignore     |    1 +
 perl-NTLM.spec |    8 +++++++-
 sources        |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---