Merge commit 'samba/v3-2-test' into wbc-test
authorGerald W. Carter <jerry@samba.org>
Thu, 17 Apr 2008 16:11:22 +0000 (18:11 +0200)
committerGerald W. Carter <jerry@samba.org>
Thu, 17 Apr 2008 16:11:22 +0000 (18:11 +0200)
commit5c29bc8931d025de4ec91247be04da4388642727
tree0345ca3ba451dfdbe2f2bb48745299fe306e6d3f
parent20104eef70ea1e2a64acb762ade2b4d64af0ee57
parentd4d706e0fa6ed2c6b8cd1d788257c7bd096a170b
Merge commit 'samba/v3-2-test' into wbc-test
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)