fix some conflicts that for some reason weren't resolved during the last cherry-picks
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 26 Feb 2013 18:52:49 +0000 (19:52 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 26 Feb 2013 18:52:49 +0000 (19:52 +0100)
commit2f5cb5945f9363ea0953b898892b93932881e511
treefcfb73f6197da6a0af0843dcd0f5fd671c58eed9
parent2b821f279ed1424d8b2f0c505fbd1ae1cfbdecce
fix some conflicts that for some reason weren't resolved during the last cherry-picks
webcit/config.guess
webcit/config.sub
webcit/subst.c
webcit/tcp_sockets.c