[nss-softokn/f13/master: 4/5] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/nss-softokn into f14

[Elio Maldonado]

commit a8587b4c532d9bd520a7fbfc530ac02ed03d5e0e
Merge: 880f988 ba44676
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Sep 28 13:48:57 2010 -0700

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/nss-softokn into f14

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