Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Thu, 19 Jun 2008 16:11:59 +0000 (11:11 -0500)
committerJohn H Terpstra <jht@samba.org>
Thu, 19 Jun 2008 16:11:59 +0000 (11:11 -0500)

Trivial merge