[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.356,1.357

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16311/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Integrate from branch

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.356
retrieving revision 1.357
diff -C2 -d -r1.356 -r1.357
*** Base.pm	28 Nov 2004 02:49:18 -0000	1.356
--- Base.pm	6 Dec 2004 22:55:20 -0000	1.357
***************
*** 64,68 ****
    $package->run_perl_script('Build.PL');
    my $self = $package->resume;
!   $self->merge_args(%args);
    return $self;
  }
--- 64,68 ----
    $package->run_perl_script('Build.PL');
    my $self = $package->resume;
!   $self->merge_args(undef, %args);
    return $self;
  }