xinit: Changes to 'master'

[Jeremy Huddleston]

 Makefile.am            |    2 +-
 org.x.startx.plist.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 49b50db0cb1ecc5611a242d12b9ca05b961c91ac
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Sep 3 19:02:56 2009 -0700

    launchd: Include LAUNCHD_ID_PREFIX in the socket name for reverse lookup to tell which launchd id owns $DISPLAY