Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commite25383400af26f10baff4d2b21db63f528ffbaeb
authorAlexander Bokovoy <ab@samba.org>
Thu, 13 Dec 2007 09:57:24 +0000 (13 12:57 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 13 Dec 2007 09:57:24 +0000 (13 12:57 +0300)
tree0a2cb2762299cb187456e8f5bff0de5c3886a861
parentceedf1a111598c815ffef9a0fe312689cc4bf136
parent5db4a7f6c423bb5df8403e1b8737a4d80cee85ae
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01)