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

[Elio Maldonado]

commit 9d3dfff9287a312ace45f79de9814f79ccbe4665
Merge: fc42b08 00a4e02
Author: Elio Maldonado <emaldona at emaldonadesktop.localdomain>
Date:   Tue Jun 14 16:00:32 2011 -0700

    Merge branch 'master' into f14

 bz709517.patch   |   14 ++++++++++++++
 nss-softokn.spec |    7 ++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---