Index: openacs-4/packages/acs-templating/tcl/head-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	15 Sep 2007 07:22:40 -0000	1.1
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	6 Oct 2007 13:22:55 -0000	1.2
@@ -342,16 +342,19 @@
         if {$html eq ""} {
             error "You must supply either -src or -html."
         }
-
         set values [list literal $html ""]
     } else {
         set values [list include $src $params]
     }
 
-    if {$direction eq "outer"} {
-        set headers [concat [list $values] $headers]
+    if {[info exists headers]} {
+      switch $direction {
+	outer {set headers [concat [list $values] $headers]}
+	inner {lappend headers $values}
+	default {error "unknown direction $direction"}
+      }
     } else {
-        lappend headers $values
+      set headers [list $values]
     }
 }
 
@@ -384,15 +387,18 @@
         if {$html eq ""} {
             error "You must supply either -src or -html."
         }
-
         set values [list literal $html ""]
     } else {
         set values [list include $src $params]
     }
 
-    if {$direction eq "outer"} {
-        lappend footers $values
+    if {[info exists footers]} {
+      switch $direction {
+	outer {lappend footers $values}
+	inner {set footers [concat [list $values] $footers]}
+	default {error "unknown direction $direction"}
+      }
     } else {
-        set footers [concat [list $values] $headers]
+      set footers [list $values]
     }
 }
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/www/blank-master.tcl	6 Oct 2007 11:28:44 -0000	1.27
+++ openacs-4/www/blank-master.tcl	6 Oct 2007 13:22:55 -0000	1.28
@@ -100,6 +100,7 @@
                 $lang
         }
     }
+  unset metas
 }
 
 # Generate the <link /> tag multirow
@@ -117,6 +118,7 @@
                 $media
         }
     }
+  unset links
 }
 
 # Generate the head <script /> tag multirow
@@ -133,9 +135,10 @@
                 $content
         }
     }
+  unset scripts
 }
-unset scripts
 
+
 # Generate the body <script /> tag multirow
 variable ::template::body_scripts
 template::multirow create body_script type src charset defer content
@@ -148,6 +151,7 @@
             $defer \
             $content
     }
+  unset body_scripts
 }
 
 # Concatenate the javascript event handlers for the body tag
@@ -188,6 +192,7 @@
 	    }
         }
     }
+  unset headers
 }
 
 # Generate the body footers
@@ -207,4 +212,5 @@
 	    }
         }
     }
+  unset footers
 }