Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 21:14:59 +0000 (13:14 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 21:14:59 +0000 (13:14 -0800)
Conflicts:

source/library-versions.in
(This used to be commit 11acca7d3884731491709dd09b7de2edc8bb5811)

1  2 
source3/configure.in
source3/library-versions.in

Simple merge
index ad6ecc466726c3cda5af906b99ccae425146fb45,9c10da525fc543a88fe3513499960dcc2a977aa3..cdd1807e232de851c2dda442799a8dbc0a253ebc
@@@ -5,6 -5,4 +5,5 @@@
  bin/libsmbclient.@SHLIBEXT@:0:1
  bin/libsmbsharemodes.@SHLIBEXT@:0:2
  bin/libaddns.@SHLIBEXT@:0:1
- bin/libmsrpc.@SHLIBEXT@:0:1
 +bin/libwbclient.@SHLIBEXT@:0:1
+ bin/libnetapi.@SHLIBEXT@:0:1