Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commite2ffd5110173c6c7d9c15853646988e536331ed0
authorAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 19:36:47 +0000 (14 22:36 +0300)
committerAlexander Bokovoy <ab@altlinux.org>
Mon, 14 Jan 2008 19:36:47 +0000 (14 22:36 +0300)
tree49f405f43e5297a2f3ea52c633ff1bcecdf282c6
parentd7a406eaa78273e0efa0ce71a9ced5f06e537aab
parentedd4cb0373a668c422b3aa2a460c1004682f3d1d
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit a40f68eac1d421c96fc3e10e5a7494dc2c5a124e)