xrdb: Changes to 'master'

[Jeremy Huddleston]

 xrdb.c |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 649faef32416e6d87ec2dcad5b0142d3b7ff04d7
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Feb 2 11:30:36 2011 -0800

    Properly honor -nocpp
    
    Previously, if the user passed -nocpp and there was a cpp present,
    cpp would be used.  This patch fixes that case.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>