Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Fri, 14 Dec 2007 04:56:53 +0000 (20:56 -0800)
committerJames Peach <jpeach@samba.org>
Fri, 14 Dec 2007 04:56:53 +0000 (20:56 -0800)
(This used to be commit 0de2b3eb515f2da21ffd1ce54979bb1f8063024b)


Trivial merge