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

Thu Jul 21 15:21:29 UTC 2011

commit 31e8131d81970eac21889c03a583aa762c9d01bf
Merge: 49484c3 4701aca
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jul 21 08:20:53 2011 -0700

    Merge branch 'master' into f15

 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(-)
---