Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Wed, 30 Jan 2008 09:00:15 +0000 (12:00 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 30 Jan 2008 09:00:15 +0000 (12:00 +0300)
(This used to be commit d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1)


Trivial merge