[nss-softokn/f13/master] (22 commits) ...Merge branch 'master' into f13

[Elio Maldonado]

Summary of changes:

  6676409... rhbz #561544 : move nss-softokn-freebl to /lib{64}, keeping (*)
  f5cbfa5... Change the verify code to use prelink -u if prelink is inst (*)
  24f4ee7... Allow prelink of softoken and freebl. On behalf of Robert R (*)
  93e1067... Bump the release number (*)
  095b10d... Update the prelink patch rhbz#504949 (*)
  b9df24a... Fix Conflicts line to prevent update when prelink is not ye (*)
  0e3fe0f... Consider the system as not fips enabled when /proc/sys/cryp (*)
  72c2ab1... Add %{?_isa} to the requires in the devel packages (#596840 (*)
  90e4e6e... Retagging (*)
  401a9b6... Cleanup changelog comments to avoid unwanted macro expansio (*)
  7c926fc... Bump release number (*)
  944c78a... Bump NVR to be greater than ones for nss-softokn subpackage (*)
  d1905df... Retagging (*)
  63a64b2... dist-git conversion (*)
  0aea387... no-longer needed (*)
  1c044e9... Modified .gitignore and source to refer to the new source a (*)
  ca91d8b... Updated patch to reflect changes in sources for 3.12.7. (*)
  c1523c8... Update to 3.12.7 (*)
  370749a... Update to 3.12.7 (*)
  3a099ab... Rely on NSS_USE_SYSTEM_SQLITE to disable local sqlite. (*)
  44989b0... Update build requires on nss-util-devel and nspr-devel to c (*)
  88180e8... Merge branch 'master' into f13

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