Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorSteve French <smfrench@gmail.com>
Sat, 5 Jan 2008 20:51:23 +0000 (14:51 -0600)
committerSteve French <smfrench@gmail.com>
Sat, 5 Jan 2008 20:51:23 +0000 (14:51 -0600)

Trivial merge