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

[Nick Bebout]

commit 2cb1ccd685a2c551028fc1dfa224be5774aecbd8
Merge: e4d3299 b3a6361
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Feb 9 17:51:07 2012 -0600

    Merge branch 'master' into el6

 libyubikey.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---