Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Fri, 16 Jan 2009 20:25:54 +0000 (12:25 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 16 Jan 2009 20:25:54 +0000 (12:25 -0800)
commit7dbebf3691576bce54ed5012b4c3d48570bdff01
treec57abe80408d68b70d426c10f0170f61ede4b8f7
parent889d0dff4e4cfd4d4b4ed16ad64de303c795f879
parent2d0fd7543d0543ce59cb84db64afb99aa1f304b4
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test