svn commit: r202464 - stable/8/etc/rc.d

[Gavin Atkinson]

On Fri, 22 Jan 2010, Doug Barton wrote:

> On 1/17/2010 3:10 AM, Gavin Atkinson wrote:
> > Author: gavin
> > Date: Sun Jan 17 11:10:24 2010
> > New Revision: 202464
> > URL: http://svn.freebsd.org/changeset/base/202464
> > 
> > Log:
> >   Merge r201440, r201445 from head:
> 
> FYI, all merges to things under etc/ should happen in etc/, not in
> directories below it. Mergeinfo for this commit (and the one in
> stable/7) needs to be pulled up.

OK, I'll see what I can do, although I may not get a chance until Sunday.  
Should this be documented on 
http://wiki.freebsd.org/SubversionPrimer/Merging?

Thanks,

Gavin