Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 22:35:37 +0000 (14:35 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 22:35:37 +0000 (14:35 -0800)
commit6a1022288217304ebf4f3a3e59a1efa472ff2c5b
tree8ff6842d38243491dfa488cd0bc1ee6077b1b0fd
parent381c38688d14ad12f5690bca5b3da2d08faf759d
parent66d6eb27a4e14b41b5a6cbaa828b7ccc4b4244b8
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 92fcf22b79809393c734e4005c34a5e7e4aaa912)