[nss-softokn/f14: 7/7] Merge branch 'master' into f14

[Elio Maldonado]

commit b7508fa4d83dc91b4b57953c25c2c3218f3ba199
Merge: 9d3dfff 4701aca
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jul 21 08:21:59 2011 -0700

    Merge branch 'master' into f14

 nss-softokn.pc.in                        |    2 +-
 nss-softokn.spec                         |   69 +-
 nss-split-softokn.sh                     |   36 +-
 softoken-minimal-test-dependencies.patch | 3769 ++++++++++++++++++++++++++++++
 sources                                  |    2 +-
 5 files changed, 3868 insertions(+), 10 deletions(-)
---