Moved files and merges

I currently have two klibc trees,

rsync://rsync.kernel.org/pub/scm/libs/klibc/klibc.git

and

rsync://rsync.kernel.org/pub/scm/libs/klibc/klibc-kbuild.git

One of the differences between the trees is that a bunch of files have been rearranged. Unfortunately, it seems that whenever I try to merge one into the other, using cg-update from the former branch to the latter, if any of these files have been touched, cg-update fails, and I have to:

- touch these files in the "old location" manually;
- manually apply the change to the new location (and, sad to say, I 
haven't even figured out how to take the numbers cg-update spits out and 
feed them to cg-diff);
- commit.

Is there any way I can record in the repository that these files are actually moved files, and that the merge should apply the patch elsewhere?

Thanks,

	-hpa