[fedora-packager/el6/master: 4/4] Merge branch 'master' into el6

[Dennis Gilmore]

commit 222913fcb9758107c96cee2a1a76570748fa5f6d
Merge: 15fc8f4 f6a3472
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Jan 5 23:57:55 2011 -0600

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 0001-add-fedora-burn-yubikey-script.patch          |   96 --------------
 ...-install-fedora-burn-yubikey-into-sbindir.patch |   46 -------
 ...and-copyright-info-for-fedora-burn-yubike.patch |   31 -----
 Makefile.in.patch                                  |  131 --------------------
 fedora-packager.spec                               |   23 ++--
 sources                                            |    2 +-
 7 files changed, 15 insertions(+), 315 deletions(-)
---