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

[Elio Maldonado]

Summary of changes:

  880f988... Resolve Bug 609613 - Adhere to Static Library Packaging Gui
  098f6ce... Fix a dependency line and fix descriptions to keep rpmlint  (*)
  ba44676... Adhere to static library packaging guidelines (#609613) (*)
  a8587b4... Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/n
  ae8bd06... Merge branch 'f14' into f13

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