diff --git a/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml b/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
index a246c657d..caff69c00 100755
--- a/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
+++ b/ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
@@ -5,15 +5,15 @@
 		    objectType="com.arsdigita.cms.contenttypes.FAQItem"
 		    classname="com.arsdigita.cms.contenttypes.FAQItem">
 
-        <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
+    <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
 
-       <ctd:authoring-step
-         labelKey="cms.contenttypes.shared.basic_properties.title" 
-         labelBundle="com.arsdigita.cms.ui.CMSResources"
-         descriptionKey="faq_item.authoring.basic_properties.description" 
+      <ctd:authoring-step
+                  labelKey="cms.contenttypes.shared.basic_properties.title" 
+               labelBundle="com.arsdigita.cms.ui.CMSResources"
+            descriptionKey="faq_item.authoring.basic_properties.description" 
          descriptionBundle="com.arsdigita.cms.contenttypes.FAQItemResources"
-        component="com.arsdigita.cms.contenttypes.ui.FAQItemPropertiesStep" 
-        ordering="1"/>
+                 component="com.arsdigita.cms.contenttypes.ui.FAQItemPropertiesStep" 
+                  ordering="1"/>
 		
        <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
  
diff --git a/ccm-cms-types-mparticle/pdl/com/arsdigita/content-types/MultiPartArticle.pdl b/ccm-cms-types-mparticle/pdl/com/arsdigita/content-types/MultiPartArticle.pdl
index 11a3988b1..682a8a063 100755
--- a/ccm-cms-types-mparticle/pdl/com/arsdigita/content-types/MultiPartArticle.pdl
+++ b/ccm-cms-types-mparticle/pdl/com/arsdigita/content-types/MultiPartArticle.pdl
@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: MultiPartArticle.pdl 287 2005-02-22 00:29:02Z sskracic $
+// $Id: MultiPartArticle.pdl 1690 2007-10-26 13:11:10Z chrisg23 $
 // $DateTime: 2004/08/17 23:15:09 $
 model com.arsdigita.cms.contenttypes;
 
diff --git a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
index 7fd2edea5..2a1eb48a0 100755
--- a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
+++ b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
@@ -40,12 +40,12 @@ import org.apache.log4j.Logger;
  * Loader.
  *
  * @author Justin Ross &lt;jross@redhat.com&gt;
- * @version $Id: Loader.java 753 2005-09-02 13:22:34Z sskracic $
+ * @version $Id: Loader.java 1763 2009-01-22 20:01:31Z pboy $
  */
 public class Loader extends PackageLoader {
     public final static String versionId =
-        "$Id: Loader.java 753 2005-09-02 13:22:34Z sskracic $" +
-        "$Author: sskracic $" +
+        "$Id: Loader.java 1763 2009-01-22 20:01:31Z pboy $" +
+        "$Author: pboy $" +
         "$DateTime: 2003/11/08 01:27:15 $";
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
diff --git a/ccm-ldn-util/src/com/arsdigita/london/util/Program.java b/ccm-ldn-util/src/com/arsdigita/london/util/Program.java
index 87a4d41bf..b6654435e 100755
--- a/ccm-ldn-util/src/com/arsdigita/london/util/Program.java
+++ b/ccm-ldn-util/src/com/arsdigita/london/util/Program.java
@@ -18,22 +18,27 @@
 
 package com.arsdigita.london.util;
 
-import com.arsdigita.runtime.Startup;
+// unused imports
+// import com.arsdigita.runtime.Startup;
 
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.CommandLine;
+//import org.apache.commons.cli.Options;
+// import org.apache.commons.cli.HelpFormatter;
+// import org.apache.commons.cli.OptionBuilder;
+// import org.apache.commons.cli.GnuParser;
+// import org.apache.commons.cli.ParseException;
+// import org.apache.commons.cli.CommandLine;
 
-import java.io.OutputStream;
-import java.io.PrintWriter;
+// import java.io.OutputStream;
+// import java.io.PrintWriter;
 
 /**
  * 
- * @deprecated - use {@link com.arsdigita.packaging.Program} 
- * 
+ * @deprecated - use {@link com.arsdigita.packaging.Program}
+ * pboy (Jan 2009):
+ * This replacement might be a bad idea. Program is used by a) the packaging
+ * programs during installation, configuration and updates and b) by all
+ * modules which provide a cli interface for bulk tasks (e.g. the import
+ * program). The latter may not be considered to a typical packaging task.
  */
 public abstract class Program extends com.arsdigita.packaging.Program {