[sks/f16: 17/17] Merge branch 'master' into f16

[Nick Bebout]

commit 3ba51b14ac3784cfec61cfd9200d417ec396c919
Merge: 730172e 06903fd
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 20:48:55 2012 -0600

    Merge branch 'master' into f16

 .gitignore            |    2 +-
 sks-1.1.1-libdb.patch |    2 +-
 sks-db.init           |  141 ++++++++++++++++++++++++++++++++++++++++++++++++
 sks-recon.init        |  142 +++++++++++++++++++++++++++++++++++++++++++++++++
 sks.spec              |   80 ++++++++++++++++++++++++++--
 sources               |    2 +-
 6 files changed, 362 insertions(+), 7 deletions(-)
---