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

[Dennis Gilmore]

commit e4d32995e0aa6a422e0f5f30478ce4e9964b8214
Merge: 192496d 09cfb7d
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Nov 8 16:39:15 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	libyubikey.spec
    	sources

 .gitignore      |    1 +
 libyubikey.spec |   16 ++++++++++++----
 sources         |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---