cf: Changes to 'master'

[Alan Coopersmith]

 X11.tmpl     |    2 +-
 configure.ac |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 97c5d4f2165e23189ba56323c33b1b8c805d2efa
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Oct 14 08:35:22 2009 -0700

    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

commit e2b8ea83e5cd13efe30e48e87523280baa71b64d
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Oct 14 08:31:08 2009 -0700

    Change default MotifDir from /usr/X11R6 to ProjectRoot (Bug #5614)
    
    Reported-by: Bernhard Rosenkraenzer <bero at arklinux.org>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>