Bug#365134: which X server is correct?

[Sanjoy Mahajan <sanjoy@mrao.cam.ac.uk>]

I just ran into this problem as well, and was about to report the same
workaround (changing /usr/bin/X11/xdm to /usr/bin/xdm in /etc/init.d/xdm
and /etc/X11/default-display-manager).  But I'm still not sure which X
server to use in /etc/X11/xdm/Xservers.  There's

-rwxr-xr-x 1 root root 1878204 2006-04-03 23:44 /usr/bin/X11/Xorg
[from xserver-xorg   6.9.0.dfsg.1-6]

or

-rwsr-sr-x 1 root root 7800 2006-04-03 23:44 /usr/bin/X11/X
[from xserver-common 6.9.0.dfsg.1-6]

Is one better than the other?

-Sanjoy

`A society of sheep must in time beget a government of wolves.'
   - Bertrand de Jouvenal