merging cacao branch to default

[Christian Thalinger]

On Thu, 2008-03-13 at 15:37 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Thu, 2008-03-13 at 15:08 +0000, Gary Benson wrote:
> > > Thomas Fitzsimmons wrote:
> > > > A few small things: instead of merging the ChangeLogs can you just
> > > > create a new entry for this patch saying essentially, "merge from
> > > > cacao branch"?
> > > 
> > > I would prefer this too.
> > 
> > But I don't commit a patch but merge the two branches.  We then have
> > changesets without corresponding ChangeLog entries.
> 
> They won't go in as individual entries though, will they, but as one
> lump.  If you do hg log after your merge you will see one changeset
> where the merge happened.

Anyway, I'll remove them.

- twisti