[pam_yubico/el5/master: 7/7] Merge branch 'el6' into el5

[Dennis Gilmore]

commit 8268412f4af7b23f90b070ed8449a39d3d50d7c6
Merge: 3784617 9c1415e
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Oct 18 10:57:14 2010 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	pam_yubico.spec
    	sources

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