Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local
authorAndrew Kroeger <andrew@sprocks.gotdns.com>
Fri, 28 Mar 2008 10:43:52 +0000 (05:43 -0500)
committerAndrew Kroeger <andrew@sprocks.gotdns.com>
Fri, 28 Mar 2008 10:43:52 +0000 (05:43 -0500)
commit9b4449b46c0404b3c694ac9c592be63185c366b7
tree543c249cb7c4a34cb87f6103d1588f9f1cba85fa
parentebe5e8399422eb7e2ff4deb546338823e2718907
parent326ae6ce9c8a6f5800d5ecb4a2bfdfc32336797d
Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local