Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v
diff -u -r1.11 -r1.12
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	4 Oct 2006 00:13:18 -0000	1.11
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	4 Oct 2006 08:52:24 -0000	1.12
@@ -91,6 +91,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -854,7 +855,7 @@
 	    	toolContentObj.setContentInUse(Boolean.FALSE);
 	    	toolContentObj.setCreated(now);
 	    	toolContentObj.setDefineLater(Boolean.FALSE);
-	    	toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+	    	toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
 	    	toolContentObj.setOfflineInstructions(null);
 	    	toolContentObj.setOnlineInstructions(null);
 	    	toolContentObj.setRunOffline(Boolean.FALSE);
@@ -902,7 +903,7 @@
 					Integer order = WDDXProcessor.convertToInteger(questionMap, ToolContentImport102Manager.CONTENT_SURVEY_ORDER);
 					item.setSequenceId(order!=null?order.intValue():dummySequenceNumber++);
 					
-					item.setDescription((String)questionMap.get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTION));
+					item.setDescription(WebUtil.convertNewlines((String)questionMap.get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTION)));
 					
 					// completion message purposely not supported in 2.0, so value can be dropped.