Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Fri, 13 Jun 2008 20:51:05 +0000 (15:51 -0500)
committerJohn H Terpstra <jht@samba.org>
Fri, 13 Jun 2008 20:51:05 +0000 (15:51 -0500)
commit407d9916a791d8b734b6aa61ec60bf56496b4389
treee2fbdd39b0d5406c8f0a7e5f2fce0bec8652d9f8
parent7571bb2760f16eae88b87a7a4465391c210983cb
parent1ad5cd93e69d8b82a71690d16df7e5cb2078bb65
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test