[aterm/el6/master] (7 commits) ...Merge branch 'master' into el6

[Andreas Bierfert]

Summary of changes:

  7cb19de... Fix typo that causes a failure to update the common directo (*)
  764c7e3... dist-git conversion (*)
  e5a984b... - 1.0.1-7 - fixup desktop file (#617517) (*)
  8bca3d9... - 1.0.1-8 - use gnome-xterm icon like xterm (*)
  2b35055... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  9fbbb01... 1.0.1-10 fix dpy problem with new libAfterImage (*)
  d32c4c7... Merge branch 'master' into el6

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