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)
commit7c2e735df3d8a4105a4944411d111fc66c13b01f
treec4920d881c2be3cb9623166c08aeae7e94f2f7b0
parentfea52dc46048ff869299267f7596b93a8c5c8b3d
parent70d99d8ed92d13fa3ec308df170595316d091988
Merge commit 'samba/v3-2-test' into wbc-test