[gkrellm/el6/master] (12 commits) ...Merge remote branch 'origin/master' into el6

[Robert Scheck]

Summary of changes:

  881678b... Fix typo that causes a failure to update the common directo (*)
  3fd27a5... - Fix crash when using multiple simap/spop mailboxes (#5418 (*)
  5afd34b... - Don't crash on laptops with dead batteries (#545987) - Do (*)
  df15f6c... - New upstream release 2.3.3 - Fixes the gkrellm client cra (*)
  9905439... - New upstream release 2.3.4 (*)
  29f163d... - Fix build with --no-add-needed (#564850). - Fix plugin di (*)
  fa47f72... - Make -devel gtk2-devel dependency ISA qualified. (*)
  d18c4e0... dist-git conversion (*)
  d740d61... - New upstream release 2.3.5 (*)
  d8343e5... Add StartupNotify and StartupWMClass to gkrellm.desktop. (*)
  211335a... - Add COPYRIGHT file to -devel and -daemon sub-packages (*)
  5baa0a6... Merge remote branch 'origin/master' into el6

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