Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 03:46:49 +0000 (22:46 -0500)
committerJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 03:46:49 +0000 (22:46 -0500)
commit72cb76f5682370f99f30a3393be19df764ee1e35
tree309f0137729c1163b2a659ad5d318177bc543b0f
parent1af605bd21383be3c14a60f4c15b77281f4c88a7
parentc2e96cf6c32a646cdcf803144f115680690e15a8
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test