Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 4 Nov 2008 12:34:30 +0000 (04:34 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 4 Nov 2008 12:34:30 +0000 (04:34 -0800)
commit85d20296175a288b32fbd514a019a6028ab7a983
tree277b3ff20739874bedb65736ec7a073c19f761bb
parentaed67987cac4daa56fe04c9330a8083223a48a1d
parent71ed975a608126769c9669409d46c894da3ca43e
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test