xinit: Changes to 'master'

[Jeremy Huddleston]

 privileged_startx/Makefile.am |   20 +++++++++++++++-----
 startx.cpp                    |    7 ++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 47d561fd6efb8923cfbace6fea40dfeb314b4662
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Apr 19 08:50:45 2008 -0700

    Cleaned up handling of defaultserver{,args}
    Per comments from Jeremy Reed on the list... basically doing for everyone what I do for Apple

commit f6e75ebf5f7f245e1cdeb883a1d2db74f2451fd4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Apr 19 08:47:20 2008 -0700

    Apple: Fixed make dist to include a missing header and not include generated sources