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

Trivial merge