Merge ssh://git.samba.org/data/git/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Thu, 22 Nov 2007 02:31:35 +0000 (18:31 -0800)
committerJames Peach <jpeach@samba.org>
Thu, 22 Nov 2007 02:31:35 +0000 (18:31 -0800)

Trivial merge