xinit: Changes to 'master'

[Jeremy Huddleston]

 org.x.X11.plist.cpp |   16 ++++++++--------
 startx.cpp          |   33 ++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 21 deletions(-)

New commits:
commit 7400760ae1b88d0c514aa119643cd412a4a68b06
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Wed Jan 9 21:03:41 2008 -0800

    OS-X: Add bindir to $PATH in startx if it's not there
    This should also fix this on SCO since it was using the incorrect BINDIR
    instead of __bindir__ in that code block...