Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Thu, 17 Jan 2008 04:26:12 +0000 (07:26 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 17 Jan 2008 04:26:12 +0000 (07:26 +0300)
commit3fffb04990f1af191a2a8b5ebe0e301d7f483102
tree01171a1c6acf905082af9a38d4a1ff8e7caa3f70
parentfd03ea4a903b79a0a7894315b3b43fb08108f938
parentf44713df4d636203354c55d9a9bc2538073cf0af
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 4256f8e093e81fbc2c1afd8f823725ae286945ce)