From ba6b1df220f72a3feb63d341f876357f1dddd2b3 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Wed, 10 Nov 2010 19:31:54 +0000
Subject: [PATCH] Merge with the trunk's r2657:

in-tree-patches deleted as not needed



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2658 d57e44dd-8a1f-0410-8b47-8ef2f437770f