gEDA-dev: cvs merging: how to merge ChangeLog files

[Ales Hvezda]

[snip]
>The general rule in gcc-land is to create one ChangeLog entry for your merge,
>which contains the ChangeLog entries you are merging.  Like this:

	Looks reasonable to me.  Let us know how the merge went.  I 
expect your merge will be easier than the glist_dev merge.

								-Ales