[drupal6-yubikey/el5: 3/3] Merge branch 'master' into el5

[Paul W. Frields]

commit fc2faa16680583753986da93681504f620aa1f1b
Merge: bfc7c65 3325883
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 19:44:51 2011 -0400

    Merge branch 'master' into el5

 drupal6-yubikey-fedora-README.txt |    6 ++++++
 drupal6-yubikey.spec              |   21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
---