[nss-softokn/f17: 5/5] Merge branch 'master' into f17

[Elio Maldonado]

commit a97eda772731b6f601ede5b1d41f268817915781
Merge: 08480c7 b8516d2
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Mar 9 18:33:00 2012 -0800

    Merge branch 'master' into f17

 .gitignore                               |    2 +-
 nss-softokn-fix-gcc47-secmodt.patch      |    8 +-
 nss-softokn.spec                         |   11 +-
 nss-split-softokn.sh                     |   17 ++-
 softoken-minimal-test-dependencies.patch |  403 +++++++++++++++---------------
 sources                                  |    2 +-
 6 files changed, 224 insertions(+), 219 deletions(-)
---