--- a/.ssh/config	Sat Mar 10 11:57:37 2012 +0200
+++ b/.ssh/config	Sat Mar 10 11:58:01 2012 +0200
@@ -1,9 +1,12 @@
+
+Host *
 
 # Allow sharing of multiple sessions over a single network connection for all
 # host. Also don't prompt for password when connection live.
-Host *
-ControlPath ~/.ssh/sock_%r@%h_%p
-ControlMaster auto
+# This option was disabled to simplify use of port forwarding.
+# You can enable it and pass "-s none" to ssh.
+# ControlPath ~/.ssh/sock_%r@%h_%p
+# ControlMaster auto
 
 # This by default.
 # UserKnownHostsFile ~/.ssh/known_hosts