[pam_yubico/el6/master: 2/2] Merge branch 'master' into el6

[Dennis Gilmore]

commit 9c1415e602c2bc0c670559d4365ea7c4184a9d86
Merge: aaa986d 297ba19
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Oct 18 10:44:45 2010 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore      |    2 ++
 pam_yubico.spec |    6 +++++-
 sources         |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---