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

[Elio Maldonado]

commit 75c391ba54b8724a037e19103a74d04d2b14516e
Merge: e744b63 6905191
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Dec 30 15:03:34 2011 -0800

    Merge branch 'f16' into f15

 nss-softokn-3.12.4-prelink.patch |   24 +++++++-----------------
 nss-softokn.spec                 |   16 +++++++++-------
 2 files changed, 16 insertions(+), 24 deletions(-)
---