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

Trivial merge