[aterm/el6/master: 7/7] Merge branch 'master' into el6

[Andreas Bierfert]

commit d32c4c705050040147457754ff01099d51f971d5
Merge: 323b594 9fbbb01
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Mar 8 06:41:24 2011 +0100

    Merge branch 'master' into el6

 aterm-dpy.patch |   24 ++++++++++++++++++++++++
 aterm.desktop   |    4 ++--
 aterm.spec      |   24 ++++++++++++++++++++----
 3 files changed, 46 insertions(+), 6 deletions(-)
---