Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Wed, 6 Feb 2008 05:58:20 +0000 (08:58 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 6 Feb 2008 05:58:20 +0000 (08:58 +0300)
(This used to be commit f59d3786abcc53065c838a2fa82ec2f4b577b16f)


Trivial merge