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

[Dennis Gilmore]

commit 820f75c0c2a43b8f83de914b11d03dd20fb6e911
Merge: e2208b4 01a0690
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Sep 3 16:45:44 2010 -0500

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

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