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

[Elio Maldonado]

commit ae8bd06e3ca8a7f4d06207f18f25a7048033c6e2
Merge: 8dd8c22 a8587b4
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Sep 28 13:53:12 2010 -0700

    Merge branch 'f14' into f13

 nss-softokn.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---