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

[Elio Maldonado]

commit 8eee535b1ef55d7e8cb821e5bf14d76a7ce1df69
Merge: a5c246e 9584c0d
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Jun 8 20:49:54 2011 -0700

    Merge branch 'master' into f15

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---