Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 7 Dec 2007 17:57:19 +0000 (09:57 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 7 Dec 2007 17:57:19 +0000 (09:57 -0800)
commit0c21c5fa84e18d78801ab79abd726e5588902476
tree37182497ae750650ce5be2cfe66a601c518e73f8
parent187d8a94eae87a32432c7c295698517b6ae31523
parent970daaa0a620d8e47475909cd7b5e54869602530
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test