Hosed X server master & server-1.6 branches (fixed now)

[Jesse Barnes]

In an effort emphasize the wisdom of our new development model (well
actually because I'm an idiot) I just overwrote HEAD of both master and
server-1.6-branch.  Fortunately airlied had the right objects in his
tree to correct things, so they're all fixed now.

Morale: use private repos!  push forced updates of remote branches
carefully!

I'm going back to my hole now to whimper in a corner.