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

[Paul W. Frields]

commit 66c9fc947985d1f4558070087b93cbf7122ad73c
Merge: c34ad9b 3325883
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 19:43:59 2011 -0400

    Merge branch 'master' into f14

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