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 18:31:57 +0000 (13:31 -0500)
committerJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 18:31:57 +0000 (13:31 -0500)

Trivial merge