As I posted about yesterday, with the ftp-master move I've decided to not upload X.Org to experimental because things will be more certain in the repo above. Instead what I've decided to do is to finish the last push to get them in to unstable, and upload directly to there, skipping experimental all together. This avoids people having to deal with /etc/apt/preferences (which is a pain in my experience) and lets us get some good work done while ftp-master gets resolved.
The bulk of what has to be done is to go through all the patches in the xfree86 packages and decide how they relate to the X.Org tree. We've already got the full complement of patches from the Ubuntu packages, but we want to ensure that there's no obvious regressions between the xfree86 and X.Org packages. I don't know how long it'll take to do this, because it depends on who volunteers and the amount of time they have, but hopefully the above packages will tide you over for a little while.