--- debian/tomcat6.default	2010-02-09 23:06:51 +0000
+++ debian/tomcat6.default	2010-03-22 15:46:42 +0000
@@ -21,8 +21,17 @@
 # Default: /var/lib/tomcat6
 #CATALINA_BASE=/var/lib/$NAME
 
-# You may pass JVM startup parameters to Java here.
-#JAVA_OPTS="-Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Xmx128m"
+# You may pass JVM startup parameters to Java here. If unset, the default
+# options (-Djava.awt.headless=true -Xmx128m) will be used.
+#JAVA_OPTS="-Djava.awt.headless=true -Xmx128m"
+
+# Use a CMS garbage collector for improved response time
+JAVA_OPTS="${JAVA_OPTS} -XX:+UseConcMarkSweepGC"
+
+# When using the CMS garbage collector, you should enable the following option
+# if you run Tomcat on a machine with exactly one CPU chip that contains one
+# or two cores.
+#JAVA_OPTS="$JAVA_OPTS -XX:+CMSIncrementalMode"
 
 # To enable remote debugging uncomment the following line.
 # You will then be able to use a java debugger on port 8000.