diff --git a/build.xml b/build.xml
index 077c56286..f200f8ae5 100644
--- a/build.xml
+++ b/build.xml
@@ -326,5 +326,20 @@
     <deltree dir="src/etc/testcases/taskdefs.tmp" />
   </target>
 
+  <target name="run.single.test" if="testcase" depends="compiletests">
+    <junit printsummary="no" fork="yes" haltonfailure="yes">
+      <classpath>
+        <pathelement location="${lib.dir}/${name}.jar" />
+        <pathelement location="${build.tests}" />
+        <path refid="classpath" />
+        <pathelement path="${java.class.path}" />
+      </classpath>
+
+      <formatter type="plain" usefile="false" />
+
+      <test name="${testcase}" />
+    </junit>
+  </target>
+
 </project>
 
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 3578b2718..7c433b076 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -423,7 +423,11 @@ public class ProjectHelper {
                                     RuntimeConfigurable parentWrapper) {
             super(parentHandler);
 
-            this.target = target;
+            if (target instanceof TaskAdapter) {
+                this.target = ((TaskAdapter) target).getProxy();
+            } else {
+                this.target = target;
+            }
             this.parentWrapper = parentWrapper;
         }
 
@@ -538,7 +542,7 @@ public class ProjectHelper {
      */
     public static void addText(Object target, char[] buf, int start, int end)
         throws BuildException {
-        addText(target, new String(buf, start, end).trim());
+        addText(target, new String(buf, start, end));
     }
 
     /**
@@ -547,7 +551,7 @@ public class ProjectHelper {
     public static void addText(Object target, String text)
         throws BuildException {
 
-        if (text == null || text.length() == 0) {
+        if (text == null || text.trim().length() == 0) {
             return;
         }
 
diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index a2c705f84..cec31e1b1 100644
--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -123,7 +123,7 @@ public class RuntimeConfigurable {
      * Add characters from #PCDATA areas to the wrapped element.
      */
     public void addText(char[] buf, int start, int end) {
-        addText(new String(buf, start, end).trim());
+        addText(new String(buf, start, end));
     }
 
     /**
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
index e64777ef6..b774af44b 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
@@ -78,10 +78,12 @@ public class EchoTest extends TaskdefsTest {
     }
     
     public void test3() { 
-        expectOutput("test3", "This \n"+
+        expectOutput("test3", "\n"+
+                              "    This \n"+
                               "    is\n"+
                               "    a \n"+
                               "    multiline\n"+
-                              "    message\n");
+                              "    message\n"+
+                              "    \n");
     }
 }