Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 13:46:40 +0000 (08:46 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 13:46:40 +0000 (08:46 -0500)

Trivial merge