Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.82 -r1.83
--- lams_admin/conf/language/lams/ApplicationResources.properties	20 Jun 2012 12:57:31 -0000	1.82
+++ lams_admin/conf/language/lams/ApplicationResources.properties	28 Jun 2012 10:45:57 -0000	1.83
@@ -363,6 +363,7 @@
 config.monitor.screen.size  =Monitor Screen Size
 config.learner.screen.size  =Learner Screen Size
 config.admin.screen.size  =System Admin Screen Size
+config.authoring.suffix =Add unique suffix when importing Learning Designs
 label.tool  =Tool
 label.tool.version  =Tool Version
 label.database.version  =Database Version
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v
diff -u -r1.112 -r1.113
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	19 Mar 2012 20:51:50 -0000	1.112
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	28 Jun 2012 10:45:49 -0000	1.113
@@ -2084,11 +2084,15 @@
 	// then read and update the title, then save again.
 	learningDesignDAO.insert(ld);
 
-	ld.setTitle(ImportExportUtil.generateUniqueLDTitle(folder, ld.getTitle(), learningDesignDAO));
-
-	learningDesignDAO.update(ld);
-	// persist
-
+	
+	// add suffix if configuration is not set or is set to true
+	String addSuffix = Configuration.get(ConfigurationKeys.SUFFIX_IMPORTED_LD);
+	if (addSuffix == null || Boolean.valueOf(addSuffix)) {
+	    ld.setTitle(ImportExportUtil.generateUniqueLDTitle(folder, ld.getTitle(), learningDesignDAO));
+	    learningDesignDAO.update(ld);
+	    // persist
+	}
+	
 	// Once we have the competences saved, we can save the competence mappings
 	Set<CompetenceMapping> allCompetenceMappings = new HashSet<CompetenceMapping>();
 	for (AuthoringActivityDTO actDto : actDtoList) {
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.47 -r1.48
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	20 Jun 2012 12:57:53 -0000	1.47
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	28 Jun 2012 10:45:49 -0000	1.48
@@ -280,5 +280,8 @@
     
     // LDEV-2889
     public static String LEARNER_COLLAPSIBLE_PROGRESS_PANEL = "LearnerCollapsProgressPanel";
-
-}
+    
+    // CNG-26 Add to lams_configuration and set to false
+    // if you don't want imported LD to have _<timestamp>_<seq_number> appended
+    public static String SUFFIX_IMPORTED_LD = "SuffixImportedLD";
+}
\ No newline at end of file