Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Fri, 6 Jun 2008 19:13:38 +0000 (14:13 -0500)
committerJohn H Terpstra <jht@samba.org>
Fri, 6 Jun 2008 19:13:38 +0000 (14:13 -0500)

Trivial merge