PERFORCE change 145881 for review

[Julian Elischer]

Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=145881
> 
> Change 145881 by zec at zec_tpx32 on 2008/07/25 10:58:22
> 
> 	#ifdef a vimage-specific macro
> 
> Affected files ...
> 
> .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#10 edit
> 
> Differences ...
> 
> ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#10 (text+ko) ====
> 
> @@ -126,7 +126,9 @@
>  	INIT_VNET_INET(curvnet);
>  	int error;
>  
> +#ifdef VIMAGE
>  	SYSCTL_RESOLVE_V_ARG1();
> +#endif
>  
>  	error = sysctl_handle_int(oidp, arg1, arg2, req);
>  	if (error == 0) {


note that you can reverse the order of the arguments I gave you to 
merge changes in the other direction too.
I have already made sure that it will not try merge anything that is 
specific to -devel