[nss-softokn/f14: 13/13] Merge branch 'f15' into f14

Wed May 11 15:23:30 UTC 2011

commit 18683a32747301b1384a18ed97f54376f3b18e67
Merge: 31d6982 a5c246e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed May 11 08:22:32 2011 -0700

    Merge branch 'f15' into f14

 .gitignore                         |    2 +-
 nss-538226.patch                   |   23 ----
 nss-disable-freebl-execstack.patch |   11 --
 nss-softokn-3.12.4-fips-fix.patch  |   12 --
 nss-softokn-3.12.4-prelink.patch   |  251 ++---------------------------------
 nss-softokn.spec                   |   32 +++--
 sources                            |    2 +-
 7 files changed, 38 insertions(+), 295 deletions(-)
---