=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-02-01 15:30:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-03-12 12:03:07 +0000
@@ -145,7 +145,7 @@
 		<action name="getPeriodsForLock"
 			class="org.hisp.dhis.dataadmin.action.lock.GetPeriodsForLockAction">
 			<result name="success" type="velocity">
-				/dhis-web-commons/ajax/responsePeriod.vm</result>
+				/dhis-web-commons/ajax/xmlPeriods.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
@@ -307,8 +307,8 @@
 		<action name="mergeOrganisationUnits"
 			class="org.hisp.dhis.dataadmin.action.organisationunitmerge.MergeOrganisationUnitsAction">
 			<result name="success" type="redirect">
-				displayOrganisationUnitMergeForm.action</result>
-		</action>
+				displayOrganisationUnitMergeForm.action</result>
+		</action>
 
 		<!-- Duplicate data elimination -->
 		
@@ -322,9 +322,9 @@
 		<action name="eliminateDuplicateData" 
 			class="org.hisp.dhis.dataadmin.action.duplicatedataelimination.EliminateDuplicateDataAction">
 			<result name="success" type="redirect">
-                displayDuplicateDataEliminationForm.action</result>
+                displayDuplicateDataEliminationForm.action</result>
 		</action>
-
+
 		<!-- Data Element Zero Value Storage Management -->
 
 		<action name="zeroValueStorageManagement"