Merged in patch from Otavio:

* Fix extranonfree support to be backward compatible with previous
  behaviour (default to false)

debian/changelog

@@ -57,6 +57,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
   * Parse isolinux.cfg case-insensatively.
   * Merge boot-i386 and boot-amd64 into boot-x86.
 
+  [ Otavio Salvador ]
+  * Fix extranonfree support to be backward compatible with previous
+    behaviour (default to false)
+
  -- Joey Hess <joeyh@debian.org>  Tue, 07 Aug 2007 18:57:05 -0700
 
 debian-cd (3.0.2) unstable; urgency=high

tools/make_disc_trees.pl

@@ -38,7 +38,7 @@ if (defined($ENV{'MAXCDS'})) {
 if (defined($ENV{'EXTRANONFREE'})) {
 	$extranonfree = $ENV{'EXTRANONFREE'};
 } else {
-	$extranonfree = 1;
+	$extranonfree = 0;
 }
 	
 my $list = "$tdir/list";