[nss] (8 commits) ...Merge branch 'f16'

[Elio Maldonado]

Summary of changes:

  a1e61fa... NSSCKBI_1_87_RTM (*)
  0598777... Merge branch 'master' into f16 (*)
  190ec81... - Remove patch that was obsoleted by the update (*)
  1c8a413... - Merge from master - This is an experimental build to fix  (*)
  953f3ce... - Rebuild with nss-softokn from 3.12 in the buildroot - All (*)
  cb85c9e... - Bug 750376 Enable updating nss to 3.13.x while keeping ns (*)
  321e446... - Bug 75036 Enable usage of nss-3.13.3 with nss-softokn-3.1 (*)
  2980194... Merge branch 'f16'

(*) This commit already existed in another branch; no separate mail sent