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

[Elio Maldonado]

commit 7d05d3a1d543854a9fbff03db6a02d5476ab58c5
Merge: 6759f61 d4cc2c8
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Dec 13 14:39:12 2011 -0800

    Merge branch 'master' into f16

 .gitignore                       |    2 +-
 nss-softokn-3.12.4-prelink.patch |  299 ++++---------------------------------
 nss-softokn.spec                 |   48 ++----
 sources                          |    2 +-
 4 files changed, 52 insertions(+), 299 deletions(-)
---