Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:44:57 +0000 (16:44 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:44:57 +0000 (16:44 +0300)
(This used to be commit 974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06)


Trivial merge