Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Mon, 15 Oct 2007 23:12:01 +0000 (16:12 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 15 Oct 2007 23:12:01 +0000 (16:12 -0700)
commitb851ff28f9982d544e4385905e448665a3a05d7f
treeb2ea90cd73aafb17d1ed5eae7d3ca22b0e2432ad
parent666f50b01f282e520c59b94944d4b1583168d46a
parentd76717fe150846cb90af58ac1c6e007aeced3df1
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 5c8adce3f368d51a67d74ae168a0f59a20e1d64c)