[emacs] (7 commits) ...merge

[Karel Klíč]

Summary of changes:

  46a1f9e... Another rebuild for ImageMagick update (*)
  9d4dcad... New upstream prerelease (*)
  a540b54... merge from master (*)
  b9a3b97... Merge branch 'master' into f17 (*)
  064dd32... Merge branch 'master' into f17 (*)
  74a143e... Fix org-mode to work without emacs-el installed. rhbz#83016 (*)
  1b3fef9... merge

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