Index: propaganda.html
===================================================================
--- propaganda.html	(revision 11677)
+++ propaganda.html	(working copy)
@@ -147,6 +147,32 @@
         not seen in any other product."</em>
     </li>
 
+    <li><p><strong>Netfilter</strong>: the Linux packet manipulation
+    framework</p>
+        Project site:  <a href="http://www.netfilter.org"
+                       >http://www.netfilter.org</a><br/>
+        Repository:  <a href="https://svn.netfilter.org/netfilter/"
+                     >https://svn.netfilter.org/netfilter/</a><br/>
+        <em>"netfilter and iptables are building blocks of a framework
+	inside the Linux 2.4.x and 2.6.x kernel. This framework
+	enables packet filtering, network addresss [and port]
+	translation (NA[P]T) and other packet mangling. It is the
+	re-designed and heavily improved successor of the
+	previous Linux 2.2.x ipchains and Linux 2.0.x ipfwadm systems."</em>
+    </li>
+
+    <li><p><strong>TWiki</strong>: a web based collaboration platform</p>
+        Project site:  <a href="http://twiki.org"
+                       >http://twiki.org</a><br/>
+        Repository:  <a href="http://ntwiki.ethermage.net/svn/twiki/"
+                     >http://ntwiki.ethermage.net/svn/twiki/</a><br/>
+        <em>"Use TWiki to run a project development space, a document
+	management system, a knowledge base, or any other groupware
+	tool, on an intranet or on the internet. Web content can be
+	created collaboratively by using just a browser. Developers
+	can create new web applications based on a Plugin API."</em>
+    </li>
+
   </ul>
 
 


