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

[Elio Maldonado]

commit 241c170cd7d1b6bac4cc2519b8d0e9fe8798dde8
Merge: a97eda7 b1bcf73
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Tue Mar 27 15:36:42 2012 -0700

    Merge branch 'master' into f17

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