[PULL] composite fix, fixing broken XKB maps

[Peter Hutterer]

The following changes since commit 01dbf2514aa0cc8c40a876a24e3cb0737c41da19:

  Merge remote-tracking branch 'jturney/master' (2011-07-13 11:44:15 -0700)

are available in the git repository at:

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

Daniel Stone (2):
      Fix non-Composite builds in PrintWindowTree
      XKB: Work around broken interps from old xkbcomp

 dix/window.c  |   10 +++++++++-
 xkb/xkb.c     |   19 ++++++++++++++++++-
 xkb/xkmread.c |   31 ++++++++++++++++++++++++++++---
 3 files changed, 55 insertions(+), 5 deletions(-)