r19136: No conflict, after "svn up" it applied correctly", merge 19126 from 3_0
authorVolker Lendecke <vlendec@samba.org>
Fri, 6 Oct 2006 15:16:18 +0000 (15:16 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:20:38 +0000 (14:20 -0500)
commit59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef
tree1a0516da5e5d477d1f0a9e19cd85f89d5c985ba5
parent109bf77ea3e96d255e74aa7c5dfbaf131a625452
r19136: No conflict, after "svn up" it applied correctly", merge 19126 from 3_0
(This used to be commit 042a22b6dd34bb147cf4f8cc10f98d4cda3ccd55)
source4/lib/socket_wrapper/socket_wrapper.c