Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Jan 2008 06:38:42 +0000 (22:38 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 12 Jan 2008 06:38:42 +0000 (22:38 -0800)
commit05fb367a014305f385a6db6653bd327861291563
tree0c0613cccf22ed0cc92498ee0371b95db01f5c8c
parent1d1b996f3879b87418bdde2fd1691ae2cca42cd4
parent45db92cc72eb2472425c17e72ff9254d35d8047c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 08645826817d42c9d4b42ea0fd5e633d7fd08d35)