Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 17:53:00 +0000 (09:53 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 17:53:00 +0000 (09:53 -0800)
commitbeb0a76b93f9dd054dbc4192516e7008e59b27d9
tree1da5b7fac3bb8582f54254ba8ec61bdb33f05ddd
parent3957ada4b6aa1f349ac1504125c4013512829ced
parent22cdd4cb507022d9c670b7d5cbc8d357b0b91637
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test