Common Neutral Hypervisor? Trademarks and the GPL

I love Free Software. Like many free software developers, I'm rather concerned about the recent debates regarding the role of trademarks and free software. Just five years ago, the idea that trademarks would be a problem with free software was almost laughable. With high profile projects like Firefox developing questionable trademarking policies, the question of how trademarks affect free software is becoming very important. As I write this, there's a heated debate within the Xen community over XenSource's new trademark terms specifically regarding the Xen trademark. Suffice to say, that the terms concern RedHat enough that they've announced that they're considering renaming Xen to CNH, or Common Neutral Hypervisor. They appear to be concerned that they can not live up to the trademarking terms. Personally, I'm not in a position to comment about the new trademark policy. I try to keep my nose clean of this sort of thing. However, it's times like this that I realize how important the GPL is in defining what free software is and how lost we would be without it (or at least, how much arguing there would be). I wonder if there's enough room in the GPLv3 process to introduce trademark terms...