diff -r 8857ff1fb4f3 -r 9f92e3aed442 .ssh/config
--- a/.ssh/config	Mon Apr 26 23:08:44 2010 +0300
+++ b/.ssh/config	Mon May 03 16:01:19 2010 +0300
@@ -2,5 +2,5 @@
 # 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
+ControlPath ~/.ssh/sock/%r@%h_%p
 ControlMaster auto