Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 03:47:00 +0000 (22:47 -0500)
committerJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 03:47:00 +0000 (22:47 -0500)

Trivial merge