Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 19:55:56 +0000 (12:55 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 19:55:56 +0000 (12:55 -0700)
commit765b37c693516757686118fffd3c80cf4d5e7344
tree7fe88e87b946645f3f477f66b68b4a20a7cb8e81
parentc833c336435cffd20579903d22ccb910ab467e53
parent3d3d1b806aef3617abaac46daf230ed32076e2ce
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test