Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.92 -r1.93
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	13 Feb 2013 13:38:55 -0000	1.92
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	4 Apr 2013 08:32:11 -0000	1.93
@@ -615,21 +615,26 @@
 
     # Load up the Automated Tests and associated Queries if necessary
     if {$load_tests_p} {
-      apm_load_libraries -force_reload=$force_reload_p -packages $packages -test_procs
-      apm_load_queries -packages $packages_to_load -test_queries
+	apm_load_libraries -force_reload=$force_reload_p -packages $packages -test_procs
+	apm_load_queries -packages $packages_to_load -test_queries
     }
 
     if { $load_libraries_p } {
         # branimir: acs-lang needs to be initialized before anything else
         # because there are packages whose *-init.tcl files depend on it.
-        apm_load_libraries -force_reload=$force_reload_p -init -packages acs-lang
-
-        apm_load_libraries -force_reload=$force_reload_p -init -packages $packages_to_load
+	apm_load_libraries -force_reload=$force_reload_p -init -packages acs-lang
+	set p [lsearch $packages_to_load acs-lang]
+	if {$p > -1} {
+	    set unique_packages [lreplace $packages_to_load $p $p]
+	} else {
+	    set unique_packages $packages_to_load
+	}
+        apm_load_libraries -force_reload=$force_reload_p -init -packages $unique_packages
     }
 
     # Load up the Automated Tests initialisation scripts if necessary
     if {$load_tests_p} {
-      apm_load_libraries -force_reload=$force_reload_p -packages $packages_to_load -test_init
+	apm_load_libraries -force_reload=$force_reload_p -packages $packages_to_load -test_init
     }
 }