[nss/f15: 13/13] Merge branch 'f16' into f15

[Elio Maldonado]

commit 98fb48c2e2afa439ecabf6dc589e2cb488a6a06e
Merge: 63ecab2 ab32397
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Mar 10 13:41:47 2012 -0800

    Merge branch 'f16' into f15

 .gitignore                                         |    2 +-
 ...ble-to-contact-LDAP-Server-during-winsync.patch |   27 +
 ...-that-causes-openswan-to-drop-connections.patch |   15 +
 ...MQP-daemon-fails-to-load-after-nss-update.patch |   15 +
 nss-ckbi-1.88.rtm.patch                            |  637 --------------------
 nss.spec                                           |   38 +-
 sources                                            |    2 +-
 7 files changed, 89 insertions(+), 647 deletions(-)
---