[nss-softokn/f17] (5 commits) ...Merge branch 'master' into f17

[Elio Maldonado]

Summary of changes:

  f940736... revert /usrmove changes. (*)
  a9a9dd6... Delete nss-softokn-fix-gcc47-secmodt.patch (*)
  4aa4fb2... Revert the previous two commits (*)
  b1bcf73... Resolves: Bug 805719 - Library needs partial RELRO support  (*)
  241c170... Merge branch 'master' into f17

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