Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Sat, 31 May 2008 15:14:41 +0000 (10:14 -0500)
committerJohn H Terpstra <jht@samba.org>
Sat, 31 May 2008 15:14:41 +0000 (10:14 -0500)

Trivial merge