Use x-terminal-emulator instead of xterm.
Merge branch 'devel' into debian-devel
0.6.0~pre9