Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into SAMBA_3_2_0
authorJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:56:55 +0000 (17:56 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:56:55 +0000 (17:56 -0700)
commit3f1ac564c0ab6d498a47da84b4b5744d8d376f3b
tree9b9f6edb9ff910f2afe5d7cae1886c83917e0bb2
parentd39ce8e37ed81f4a34a148f975874989d8d187a1
parent52ca48f1881fc7b6ac9d1252468bb20eee174407
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into SAMBA_3_2_0