Landed non-branch version on the tip

nglayout.mk

@@ -20,7 +20,7 @@ DEPTH=.
 # Command macro defines
 #
 
-CVSCO = cvs -q co -P -r NGLayoutStability_BRANCH
+CVSCO = cvs -q co -P
 
 THIS_MAKEFILE = nglayout.mk
 
@@ -30,14 +30,12 @@ LIBPREF_BRANCH = XPCOM_BRANCH
 PLUGIN_BRANCH =
 
 # CVS commands to pull the appropriate branch versions
-CVSCO_LIBPREF = $(CVSCO)
-#CVSCO_LIBPREF = $(CVSCO) -r $(LIBPREF_BRANCH)
+CVSCO_LIBPREF = $(CVSCO) -r $(LIBPREF_BRANCH)
 CVSCO_IMGLIB = $(CVSCO)
 CVSCO_NETLIB = $(CVSCO)
 CVSCO_NGLAYOUT = $(CVSCO)
 CVSCO_LIZARD = $(CVSCO)
-CVSCO_PLUGIN = $(CVSCO)
-#CVSCO_PLUGIN = $(CVSCO) -A
+CVSCO_PLUGIN = $(CVSCO) -A
 
 # The list of directories that need to be built to build the standalone
 # nglayout test program. The order is important.