[nss-softokn/f15: 2/2] Merge branch 'f16' into f15

[Elio Maldonado]

commit a56ed3180d3d4fe6cfb7abd885247bffc9b28abb
Merge: 5314a0c 0bfc442
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Mar 20 18:10:57 2012 -0700

    Merge branch 'f16' into f15

 nss-softokn.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---