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

[Dennis Gilmore]

commit aaa986d8815a4e49880e564ba94259745e3a5d4e
Merge: 2c78705 01a0690
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Sep 3 16:46:31 2010 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 pam_yubico.spec |   16 ++++++----------
 sources         |    2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)
---