Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000 (14:01 -0800)
committerJames Peach <jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000 (14:01 -0800)

Trivial merge