[nss-softokn/f15: 2/3] Merge branch 'f16' into f15

[Elio Maldonado]

commit cebeb962fa4aeddb3e86c7bfe8c5974501e12c74
Merge: a56ed31 473f4ec
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Apr 7 10:25:53 2012 -0700

    Merge branch 'f16' into f15

 nss-softokn.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---