Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorHerb Lewis <herb@samba.org>
Thu, 4 Sep 2008 21:48:27 +0000 (14:48 -0700)
committerHerb Lewis <herb@samba.org>
Thu, 4 Sep 2008 21:48:27 +0000 (14:48 -0700)
commit14a7860681124ee75e966bd1e86f04f206fcec4c
tree496dcedcede975ddd65f547ffcfb6e48dc0b5d4c
parent24992010cb57556ee2b65776f26e586ea0e3895d
parent174fd4a73153fb5ed5b660f66da84c25636059af
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit 0311d171970e888754cf614adfdfc1f8e0f5b04e)