Merging r19041, r19060 to 1.3.x

Hi,

While trying to merge r19041 onto the 1.3.x branch, I discovered that
it doesn't merge cleanly. It skips most of the files and gives
conflicts in one file. Could someone either do the merge, or create a
backport branch for this?

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 3 20:23:44 2006