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

[Elio Maldonado]

commit 1d7fd71ea91408380edbdc0e9ffcdcfc62893134
Merge: 7c3dfdc 1283c67
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Apr 10 11:58:27 2012 -0700

    Merge branch 'master' into f17

 ...Restore-use-of-NSS_NoDB_Init-or-alternate.patch |   13 +++++++++++++
 nss-softokn.spec                                   |   17 ++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---