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

[Elio Maldonado]

commit c2be9c41bed4173bb3507fb5af4c626f64fd23e2
Merge: 527750e 453276c
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Feb 1 17:56:57 2011 -0800

    Merge branch 'master' into f14

 allow-content-types-beyond-smime.patch | 2282 ++++++++++++++++++++++++++++++++
 honor-user-trust-preferences.patch     |   93 ++-
 nss.spec                               |   10 +-
 3 files changed, 2369 insertions(+), 16 deletions(-)
---