Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 16:50:41 +0000 (11:50 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 16:50:41 +0000 (11:50 -0500)
(This used to be commit 7135d2aea5a68a79e2a77d4a02219436f5e154cc)


Trivial merge