Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 18 Dec 2007 01:03:07 +0000 (17:03 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 18 Dec 2007 01:03:07 +0000 (17:03 -0800)
commit289d793629592b8aff24d3583fc052ac3c30247a
tree9827aa270ff5a4200cbce5776871e6f411aabc2d
parent2b0a570c77b5e4afba44e670f1ebf0016f96d30a
parenta62cc944435fb9964c765cb9495f18308823ac8f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 8223624fea7c1b61e9231168cb4d82771576cbc5)