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

[Elio Maldonado]

commit 92c7fb56768ab3dc909fb86d320102439620efeb
Merge: 576d83b d7e6ef5
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jan 13 14:04:41 2011 -0800

    Merge branch 'master' into f14

 .gitignore                       |    2 +-
 nss-sysinit-fix-trustorder.patch |   30 +++++++++++++++
 nss-sysinit-userdb-first.patch   |   51 ++++++++++++++++----------
 nss.spec                         |   73 ++++++++++++++++++++++++--------------
 sources                          |    2 +-
 5 files changed, 110 insertions(+), 48 deletions(-)
---