Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 6 Dec 2007 19:17:37 +0000 (11:17 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 6 Dec 2007 19:17:37 +0000 (11:17 -0800)
(This used to be commit 48252d124d83aaa502b7821564978b9bf5babd03)


Trivial merge