xinit: Changes to 'master'

[Alan Coopersmith]

 xinit.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2d88aba7a84d153c2fc3226eece751395990edc7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Jan 28 18:50:20 2011 -0800

    Merge adjacent if (timeout) blocks
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Dirk Wallenstein <halsmit at t-online.de>