[nss/f14/master: 4/4] Merge branch 'master' into f14

[Elio Maldonado]

commit b7d02ab06448aebb8af5bff020a730d1617a19a6
Merge: 78e9db1 1c9dbe3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 25 13:14:27 2010 -0700

    Merge branch 'master' into f14

 .gitignore               |    2 +-
 nss.spec                 |   15 +-
 sources                  |    2 +-
 validate-arguments.patch |  720 ----------------------------------------------
 4 files changed, 10 insertions(+), 729 deletions(-)
---