[git/f14/master] (6 commits) ...Merge remote-tracking branch 'origin/master' into f14

[Adam Tkac]

Summary of changes:

  8c32078... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  031dd59... Update to 1.7.4.1 (*)
  8b78beb... Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs (*)
  94ce6ac... Clean up documentation settings (the defaults changed in 1. (*)
  bba13f4... Update to 1.7.4.2. (*)
  25a2b5e... Merge remote-tracking branch 'origin/master' into f14

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