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

[Elio Maldonado]

commit 527750ed6083b7c62bc804215aff3db8005f411f
Merge: 92c7fb5 612496b
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Jan 22 10:04:11 2011 -0800

    Merge branch 'master' into f14

 honor-user-trust-preferences.patch |  133 ++++++++++++++++++++++++++++++++++++
 nss-sysinit-fix-trustorder.patch   |   30 --------
 nss-sysinit-userdb-first.patch     |   78 ---------------------
 nss.spec                           |   12 ++--
 4 files changed, 140 insertions(+), 113 deletions(-)
---