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:08:57 +0000 (16:08 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:08:57 +0000 (16:08 +0300)
(This used to be commit d46fc35dd4e22ecd777800a8cdb6c31763d0fac4)


Trivial merge