Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit985bd1e642b6e54f1bc95cd4cfcceb96107e383d
authorJeremy Allison <jra@samba.org>
Sat, 29 Mar 2008 00:31:33 +0000 (28 17:31 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 29 Mar 2008 00:31:33 +0000 (28 17:31 -0700)
tree7f0f3b71505cb27b26483720e96f1d96728272cc
parenteef53e9603d4f3d892ffe00b061def5d717ca481
parent73ead752c5ec7104ea0eed7d963dc36467c81981
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test