[PULL] two small fixes for 1.9

[Peter Hutterer]

dix patch has no functional change. The Xnest/Xephyr fix is to prevent
modifier issues.

The following changes since commit 505724c5f3e4fc1475fa54f20d08c0c06fb32443:
  Keith Packard (1):
        In DRI2Connect, check to see if DRI2 has been initialized (bug 28424)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git for-keith

Peter Hutterer (1):
      dix: the default axis mode is Relative, not "0".

Xiaoyang Yu (Max) (1):
      Re-enabled Xnest fix for focus in + modifier bug.

 dix/devices.c           |    2 +-
 hw/kdrive/ephyr/ephyr.c |  107 ++++++++++++++++++++---------------------------
 2 files changed, 46 insertions(+), 63 deletions(-)