incorrect merge result

[Burckhardt, Jacob P.]

Jacob Burckhardt writes:
> In this email, I attached the merged result from cvs-1.11.1p1,

Sorry, I forgot to attach it.  Here it is.

CORRECT_OUTPUT
Description: Binary data