[nss-softokn/f16: 12/12] Merge branch 'master' into f16

[Elio Maldonado]

commit 6759f61860a574e4c4bc268789d041fcec09ad1c
Merge: 9ad1b9a 3f48075
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Dec 6 16:08:32 2011 -0800

    Merge branch 'master' into f16

 .gitignore           |    1 -
 nss-softokn.spec     |    9 ++++++++-
 nss-split-softokn.sh |   36 +++---------------------------------
 sources              |    1 -
 4 files changed, 11 insertions(+), 36 deletions(-)
---