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)
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)


Trivial merge