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

[Elio Maldonado]

commit e7079bbf547d951d1d107eefc3c251ece296e5dd
Merge: 94bf03b 1c9dbe3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 25 13:17:58 2010 -0700

    Merge branch 'master' into f13

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