Undo local diff.

It was introduced as one of the patches fixing
https://bugs.freedesktop.org/show_bug.cgi?id=28181

This is marked fixed upstream, and was spotted on non-NetBSD, so it's
very likely to be unnecessary.

This diff was causing a double-free, causing Xorg to crash when closing
pkgsrc/emulators/{retroarch,nestopia}.
This is most likely a problem that became more evident from jemalloc
debug which is filling free'd memory with 0x5a5a5a...

Fixes PR xsrc/54246.

merge xorg-server 1.20.3.

first merge of netbsd changes. not tested yet.

re-apply the fix for https://bugs.freedesktop.org/show_bug.cgi?id=28181,
from the comment #40 from this bug.

merge cornflakes with xorg-server 1.10.3

revert the change below, to help merge 1.10.3. there's a new version of
this coming up shortly:

http://mail-index.netbsd.org/source-changes/2011/03/18/msg020067.html

Log Message:
Pull up fix from https://bugs.freedesktop.org/show_bug.cgi?id=28181 to
prevent random segfaults of the X server when using composite with the
ati driver.

Pull up fix from https://bugs.freedesktop.org/show_bug.cgi?id=28181 to
prevent random segfaults of the X server when using composite with the
ati driver.

This makes my X session rock solid when running KDE 4.5 on a MacBookPro
2,2 with an ATI Radeon Mobility X1600. The X server was crashing very
frequently before.

OKed by mrg@ and macallan@. Addresses PR xsrc/44730.

import xorg-server 1.9.2. important changes since 1.6.5 include:

- built-in symbol visibility, default not export
- fixes for various crashes
- many fixes for XI2, EXA, dix, render, glx, xkb, EDID, randr, Xv,
resource handling, Xext, vfb, xfree86 / vga and composite support.
- fixes several memory leaks
- many many documentation updates
- record extension enabled
- no longer looks for XF86Config files

initial import of xorg-server-1.6.5

initial import of xorg-server-1.6.1.901