* Xwrapper.config should really move away from x11-common, now that we
  only have one X server to deal with
* Merge xserver-xorg and xserver-xorg-core?  What about the circular dep?