[nss-softokn/f14/master: 15/15] Merge branch 'master' into f14

[Elio Maldonado]

commit a28460e3edd647bb1589cf3821d4950da35562a9
Merge: 5b29a41 811d687
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jan 13 14:08:41 2011 -0800

    Merge branch 'master' into f14

 .gitignore       |    2 +-
 nss-softokn.spec |   49 ++++++++++++++++++++++++++++++++-----------------
 sources          |    2 +-
 3 files changed, 34 insertions(+), 19 deletions(-)
---