[nss/f12/master: 22/22] Merge branch 'f13' into f12

[Elio Maldonado]

commit 1a893363aea1daaa2462277109b50801dc009c24
Merge: 0b65e56 c953934
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Sep 9 16:06:44 2010 -0700

    Merge branch 'f13' into f12

 .gitignore                     |    2 +-
 nss-nolocalsql.patch           |   52 ---
 nss.spec                       |   41 ++-
 renegotiate-transitional.patch |    2 +-
 sources                        |    2 +-
 validate-arguments.patch       |  720 ----------------------------------------
 6 files changed, 30 insertions(+), 789 deletions(-)
---