That is only if Xorg doesn't switch to GPLv3. Though of course in that case (i.e. Xorg not switching) someone can fork Xorg, relicense it to GPLv3 and merge th

That is only if Xorg doesn't switch to GPLv3. Though of course in that case (i.e. Xorg not switching) someone can fork Xorg, relicense it to GPLv3 and merge the TinyX code - so everyone gets their cake. In practice however i doubt anyone would bother with any of the above (including Xorg wanting to merge any TinyX contributions).