Merge from 2.0 branch.
VelocityWriter should still be a Writer (fix from rev. 746539)

git-svn-id: https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk@960033 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java b/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
index 32d48b1..c5831da 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
@@ -31,7 +31,7 @@
  * @author Anil K. Vijendran
  * @version $Id$
  */
-public final class VelocityWriter implements Filter
+public final class VelocityWriter extends Writer implements Filter
 {
     /**
      * constant indicating that the Writer is not buffering output