[nss/f14/master] (7 commits) ...Merge branch 'f13' into f14

[Elio Maldonado]

Summary of changes:

  9b182d2... Merge branch 'master' into f13 (*)
  94bf03b... Merge branch 'master' into f13 (*)
  e7079bb... Merge branch 'master' into f13 (*)
  fdefa43... Update to 3.12.7 (*)
  87235ae... Merge with master to update to 3.12.7 (*)
  c953934... Fix unclosed comment in renegotiate-transitional.patch (*)
  9c7cfa3... Merge branch 'f13' into f14

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