Merge.

Hi, I find it annoying that there are two versions of essentially the same resource. I don't understand why legal papers should be required for code that nobody claims ownership to. I am quite sure that there are legal methods to obtain the papers you require for the license. It just makes so much sense to me to have one emacs. Since the X version is more modern etc etc, it should be the obvious choice. The fact that you can modify GPL software, create XEmacs, and then have legal issues about how you are able to merge the code means (to me) that there are fundamental flaws in the GPL licensing system. This is obviously just my humble opinion on the matter. If this is a vaguely democratic process, my vote goes with one Xemacs. Keep up the good work. You guys are doing a fantastic job. Maybe i'll be able to help one day when I am more proficient in X/Linux development. Kind Regards -craig.