[PULL 1.13] - XQuartz / Mountain Lion deadlock cherrypick from master

[Jeremy Huddleston Sequoia]

The following changes since commit 92ecbf5f0f516aacb7f0034e3786c4454a07fe8d:

  No changes from 1.13.0.902 (rc2) (2012-12-13 21:05:24 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~jeremyhu/xserver server-1.13-branch

for you to fetch changes up to 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba:

  XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced (2012-12-18 00:31:53 -0800)

----------------------------------------------------------------
Jeremy Huddleston Sequoia (2):
      XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2
      XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced

 hw/xquartz/xpr/dri.c      |  6 ++++++
 hw/xquartz/xpr/xprFrame.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)