Index: openacs-4/packages/layout-managed-subsite/lib/tabbed-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/tabbed-master.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/layout-managed-subsite/lib/tabbed-master.adp	8 Jan 2010 21:31:04 -0000	1.2
+++ openacs-4/packages/layout-managed-subsite/lib/tabbed-master.adp	7 Feb 2010 23:02:58 -0000	1.3
@@ -4,7 +4,9 @@
 <if @head@ not nil><property name="head">@head;noquote@</property></if>
 <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
 <if @context@ not nil><property name="context">@context;noquote@</property></if>
+<if @show_tabs_p@ true>
 <property name="&navigation">navigation</property>
+</if>
 <property name="main_content_p">@main_content_p@</property>
 
 <if @pageset_page_p@>
Index: openacs-4/packages/layout-managed-subsite/lib/tabbed-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/tabbed-master.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/layout-managed-subsite/lib/tabbed-master.tcl	19 Jan 2010 22:52:48 -0000	1.3
+++ openacs-4/packages/layout-managed-subsite/lib/tabbed-master.tcl	7 Feb 2010 23:02:58 -0000	1.4
@@ -66,6 +66,8 @@
     }
 }
 
+set show_tabs_p [expr { [template::multirow size navigation] > 1 || [parameter::get -package_id [ad_conn subsite_id] -parameter ShowSingleButtonNavbar -default 0]}]
+
 if { !$pageset_page_p } {
     array set theme \
         [layout::theme::get \