Index: openacs-4/packages/ref-language/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-language/tcl/apm-callback-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ref-language/tcl/apm-callback-procs.tcl	17 Oct 2010 21:06:09 -0000	1.3
+++ openacs-4/packages/ref-language/tcl/apm-callback-procs.tcl	9 Aug 2013 13:40:37 -0000	1.4
@@ -27,7 +27,10 @@
             5.6.0d1 5.6.0d2 {
 
                 # If the constraint doesn't exist, we don't care ...
-                catch [db_dml drop_constraint {}]
+                catch {
+                    db_dml drop_unique_index {}
+                    db_dml drop_constraint {}
+                }
 
                 set new_languages [ref_language::apm::lang_list_for_5_6_0d2]
 
Index: openacs-4/packages/ref-language/tcl/apm-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-language/tcl/apm-callback-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ref-language/tcl/apm-callback-procs.xql	17 Oct 2010 21:06:09 -0000	1.2
+++ openacs-4/packages/ref-language/tcl/apm-callback-procs.xql	9 Aug 2013 13:40:37 -0000	1.3
@@ -8,4 +8,10 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="ref_language::apm::after_upgrade.drop_unique_index">
+    <querytext>
+      drop index language_codes_name_uq
+    </querytext>
+  </fullquery>
+
 </queryset>