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

[Elio Maldonado]

commit 6905191eff6b369976079ec29e3d95143e0e9f93
Merge: 50733a0 d63e2bc
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Dec 30 14:51:54 2011 -0800

    Merge branch 'master' into f16

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