Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:31:47 +0000 (10:31 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:31:47 +0000 (10:31 -0800)
commit7c701feb3da276a347923eb0a55a851216d27f9e
treee9a6e8f5a5da1c9e136d9f4e79d04c74a9c1c258
parent9c63e1820bab51a7cc09878d78ddce061c3292ec
parentce9e918c95a81470056eef74878aeb10aadbaacf
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit ed7322dcfa6f42743b784246f5de74d4e64b0765)