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

[Elio Maldonado]

commit 49484c30ccd52b8dc6c5ba0aad5fcab020058c6c
Merge: 8eee535 00a4e02
Author: Elio Maldonado <emaldona at emaldonadesktop.localdomain>
Date:   Tue Jun 14 15:59:40 2011 -0700

    Merge branch 'master' into f15

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