[PULL] Fix an XQuartz regression freeing incorrectly in QuartzSetCursor

[Jeremy Huddleston]

The following changes since commit 3209b094a3b1466b579e8020e12a4f3fa78a5f3f:

  DRI2: re-allocate DRI2 drawable if pixmap serial changes (2010-07-09 16:14:14 -0700)

are available in the git repository at:
  git://anongit.freedesktop.org/~jeremyhu/xserver master

Jan Hauffa (1):
      XQuartz: Remove some dead code.

Jeremy Huddleston (1):
      XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs

 hw/xquartz/quartz.c        |    4 ----
 hw/xquartz/quartzCocoa.m   |   11 -----------
 hw/xquartz/quartzCommon.h  |   15 ---------------
 hw/xquartz/xpr/xprCursor.c |    6 +++++-
 4 files changed, 5 insertions(+), 31 deletions(-)