X.Org X server

Merge proposals dependent on lp://staging/~rdoering/xorg-server/karmic-xdmx-fixes

  1. karmic-xdmx-fixes
  2. Dependent merge proposals

lp://staging/~rdoering/xorg-server/karmic-xdmx-fixes has no merge proposals.