Merge branch 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile:
  e16-config: Remove.
  xinitrc and friends: Embed prompt-and-run functionality in xinitrc.
  gitconfig: Use magical hacked 6x13 font.
  fonts.conf: New configuration file.

Conflicts:

	e16-bindings

diff --cc e16-bindings
index 86ed4ea,afd2fc8..e3ff629
--- 1/e16-bindings
--- 2/e16-bindings
+++ b/e16-bindings
@@@ -34,8 -34,8 +34,9 @@@ KeyDown   S5       Up area move 0 -
  KeyDown   S5     Left area move -1 0
  KeyDown   S5    Right area move 1 0
  KeyDown    5       F8 exec xatom set XINIT_COMMAND :terminal
- KeyDown    5       F9 exec xrun
+ KeyDown    5       F9 exec xatom set XINIT_COMMAND :ask-run
+ KeyDown          5      F10 exec xatom set XINIT_COMMAND :ask-command
 +KeyDown          5      F11 exec xscreensaver-command -lock
  KeyDown    5      F12 exec xshutdown
  KeyDown    5      Tab focus next
  KeyDown   C5       Up wop * raise