Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commitd46fc35dd4e22ecd777800a8cdb6c31763d0fac4
authorAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:08:57 +0000 (31 16:08 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:08:57 +0000 (31 16:08 +0300)
tree8e85e8e6afa4ffe565fb8dd4e0306161f8dae06f
parentd841a3fc999c5ebd9e9d54b2bd5099b1b50402b1
parentcb0fad1c97e1b590791fc0661f8ada1cdaa69318
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration