[PULL] 1.9 fixes for enter/leave issues and xkb mapping updates.

[Peter Hutterer]

Keith,

please pull yesterday's patches into master. Both are 1.9 material.

The following changes since commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc:

  Bump to version 1.8.99.905 (1.9 RC5) (2010-07-14 12:57:29 -0700)

are available in the git repository at:
  git://people.freedesktop.org/~whot/xserver.git for-keith

Peter Hutterer (2):
      dix: hack around enter/leave event issues for grabbed devices (#27804)
      xkb: use GetMaster instead of dev->u.master.

 dix/enterleave.c |   27 ++++++++++++++++++---------
 xkb/xkb.c        |   32 ++++++++++++++++----------------
 2 files changed, 34 insertions(+), 25 deletions(-)