[nss-softokn/f15: 22/22] Merge branch 'f16' into f15

[Elio Maldonado]

commit e744b6310ab3a0c94e3db2ed822456e5499df93c
Merge: 93f017d 50733a0
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 14 17:12:21 2011 -0800

    Merge branch 'f16' into f15

 .gitignore                                 |    2 +-
 add-relro-linker-option.patch              |   16 +
 drbg.patch                                 |  481 +++++++++++++++++
 iquote.patch                               |   25 +
 linux3.patch                               |   31 ++
 nss-softokn-3.12.4-fips-fix.patch          |   11 +
 nss-softokn-3.12.4-prelink.patch           |  299 ++----------
 bz709517.patch => nss-softokn-710298.patch |    6 +-
 nss-softokn-748524.patch                   |  157 ++++++
 nss-softokn.spec                           |   97 +++-
 nss-split-softokn.sh                       |   36 +--
 softoken-minimal-test-dependencies.patch   |  774 +++++++++++++++++++++-------
 sources                                    |    2 +-
 13 files changed, 1421 insertions(+), 516 deletions(-)
---