[nss-softokn/f17] (8 commits) ...Merge branch 'f18' into f17

[Elio Maldonado]

Summary of changes:

  c458ee9... Fix application of patch10 (*)
  9c32418... Fix the patch to be based on what we had on 3.13.6 that wor (*)
  3a10f75... Merge branch 'f18' (*)
  bdb74bb... Bug 883114 - Install bltest and fipstest as unsupported too (*)
  a3ce9e4... Update to NSS_3_14_1_RTM (*)
  d006530... Require nspr version >= 4.9.4 (*)
  25293d6... Cleanup patches for building softoken only libraries and te (*)
  02959ed... Merge branch 'f18' into f17

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