[pam_yubico/f13/master: 3/3] Merge branch 'master' into f13

[Dennis Gilmore]

commit c16401af049c9aeb0e6a3abffd5ab80ad68c2af4
Merge: bc0e0a2 01a0690
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Sep 3 16:44:36 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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