[PULL] A few small fixes

[Jon TURNEY]

Hi Keith,

A few small fixes for problems in 1.13.  Please consider pulling into master.

Thanks.

The following changes since commit 4b7f00346daed20c96f3e8ea13ae411858a5424b:

  dix: fix crash on shutdown if a disabled device is still grabbed (XI1 grab)
(2012-10-10 14:40:45 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~jturney/xserver master

for you to fetch changes up to a69429a17bf4630f6e26f61630a1c2b287202627:

  Fix 'make distcheck' for hw/xwin (2012-10-11 12:54:12 +0100)

----------------------------------------------------------------
Jon TURNEY (4):
      Correct description of -displayfd option in man page.
      hw/xwin: Only add GLX extension once.
      Fix compilation of Xorg DDX without XF86VIDMODE
      Fix 'make distcheck' for hw/xwin

 hw/xfree86/common/Makefile.am |    3 ++-
 hw/xwin/InitOutput.c          |    5 +++--
 hw/xwin/Makefile.am           |    3 +++
 hw/xwin/glx/Makefile.am       |    3 ++-
 man/Xserver.man               |    2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)