Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commit5b3579b14cd5ea6e67ff3c91f5bed155d944c049
authorJeremy Allison <jra@samba.org>
Fri, 8 Aug 2008 21:33:55 +0000 (8 14:33 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 8 Aug 2008 21:33:55 +0000 (8 14:33 -0700)
tree1d9a32f61a0945ca0299fd585751144c74d3937d
parentecc3838e4cb5d0c0769ec6d9a34a877ca584ffcc
parent0fba9549894affa8e2ea0b7fd15812f56f3319a3
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test