xrdb: Changes to 'master'

[Alan Coopersmith]

 COPYING      |   55 +++++++++++++++++++++++++++++++++++++++++++++++--------
 Makefile.am  |    4 ++--
 configure.ac |   20 ++++++++------------
 3 files changed, 57 insertions(+), 22 deletions(-)

New commits:
commit b3a7a1fb2356d6fba676746f60176f1a69b9a72a
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 12 15:04:50 2009 -0700

    xrdb 1.0.6
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

commit eafabf10c3738bba223d7522f8b5804d1d54c6d4
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 12 14:55:22 2009 -0700

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

commit d2c5485dcab34074fa9bd62b7a0567364382e07b
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 12 14:37:28 2009 -0700

    Fill in COPYING file with notices from xrdb.c & xrdb.man
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>