[libyubikey/el5: 2/2] Merge branch 'master' into el5

[Dennis Gilmore]

commit a7cca77041ff8d969f7fa2ff076f310fba5e5df6
Merge: ce7cedc 09cfb7d
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Nov 8 16:35:09 2011 -0600

    Merge branch 'master' into el5

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