# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1269983046 -10800
# Node ID 4cccbd0d68516ef40bc322b0274c8ab9b98da790
# Parent  918a1b3e1a7edb9fb996063a22cd573cc3b6d76f# Parent  514847fa6797f42e9e0c48fd340ea45cb27e0ffa
Automated merge with file:///cygdrive/e/srv/hg/skel

diff -r 514847fa6797 -r 4cccbd0d6851 .ssh/config
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.ssh/config	Wed Mar 31 00:04:06 2010 +0300
@@ -0,0 +1,6 @@
+
+# Allow sharing of multiple sessions over a single network connection.
+# Also don't prompt for password second time.
+Host *
+ControlPath ~/.ssh/sock/%r@%h:%p
+ControlMaster auto
diff -r 514847fa6797 -r 4cccbd0d6851 Makefile
--- a/Makefile	Tue Mar 23 23:48:10 2010 +0200
+++ b/Makefile	Wed Mar 31 00:04:06 2010 +0300
@@ -12,7 +12,7 @@
   host_os = windows
 endif
 
-ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .mc .vimrc .inputrc
+ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .mc .vimrc .inputrc .ssh
 
 .PHONY: install
 install: