Index: branches/htmlform/cgi-bin/CommonWeb.pm
===================================================================
--- branches/htmlform/cgi-bin/CommonWeb.pm	(revision 479)
+++ branches/htmlform/cgi-bin/CommonWeb.pm	(revision 480)
@@ -19,8 +19,6 @@
 
 @EXPORT      = (); #export nothing by default
-%EXPORT_TAGS = ( ALL => [qw( &printHeader &printError
-				&printAndExit &desanitize &cleanInput )],
-                 lean    => [qw( &printHeader &printError
-				&printAndExit &cleanInput )]
+%EXPORT_TAGS = ( ALL => [qw( &printError &printAndExit &desanitize &cleanInput )],
+                 lean    => [qw( &printError &printAndExit &cleanInput )]
 		);
 
Index: branches/htmlform/templates/dberr.tmpl
===================================================================
--- branches/htmlform/templates/dberr.tmpl	(revision 480)
+++ branches/htmlform/templates/dberr.tmpl	(revision 480)
@@ -0,0 +1,4 @@
+<br><div class="center regular">Database error:<br>
+<TMPL_VAR NAME=errmsg><br><br>
+<input type="button" value="Back" onclick="history.go(-1)">
+</div>