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)

Trivial merge