Although there is no official stance on it, there seems that debian will not be shipping the monolithic X.org tree, but the modularised version from freedesktop.org. That will happen in sarge+1 though.

See this link for details.