[nss-softokn/f12/master: 23/23] Merge branch 'f13' into f12

[Elio Maldonado]

commit 7df266e8c177810a9177cec16e2cd303cc20e4b2
Merge: 09fa6e9 d810a7f
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Sep 12 13:36:00 2010 -0700

    Merge branch 'f13' into f12
    
    Selective merge to preserve changelog history on this branch

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