Merge branch 'sh/daemon' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 21:41:57 +0000 (14:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 21:41:57 +0000 (14:41 -0700)
* sh/daemon:
  socksetup: don't return on set_reuse_addr() error


Trivial merge