Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorSteve French <smfrench@gmail.com>
Sat, 5 Jan 2008 20:51:23 +0000 (14:51 -0600)
committerSteve French <smfrench@gmail.com>
Sat, 5 Jan 2008 20:51:23 +0000 (14:51 -0600)
commit56a8ef0bbb6abfd3bc81439a159a9bc41779495a
treece04b61f82f25417639bbb29942433b2b2654530
parent8122eb767a83cd5f070ee99abae037c2a30c43e9
parent4a413e4bd177402a1697cffac43d35e94cc55102
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit d3b91e494c824a65506ba1bc1cba5bba77000530)