Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test
authorJim McDonough <jmcd@samba.org>
Tue, 13 May 2008 22:42:18 +0000 (18:42 -0400)
committerJim McDonough <jmcd@samba.org>
Tue, 13 May 2008 22:42:18 +0000 (18:42 -0400)
commit6dd44ebf22762e852b43e7dbcd095a58cc45abad
tree505d651dcb6d7fc089c4090f6a1653bf53e50412
parent0f7b11accec7df1c0e9a9dc0828a5e0c5ddec4cb
parent08d168f0e5b8fb07e95a5118a839e0da53e9d363
Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test