Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Wed, 11 Jun 2008 15:36:27 +0000 (10:36 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 11 Jun 2008 15:36:27 +0000 (10:36 -0500)
commit7571bb2760f16eae88b87a7a4465391c210983cb
tree7228ee07811f3d7075af86efeaf94601b65bebf0
parent0828099dd7cc3145d2b13fd74c4943ed98bf9750
parent5ec31972e05b0479c615bf64f8fa147ab501345b
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test