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 14:29:52 +0000 (09:29 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 14:29:52 +0000 (09:29 -0500)

Trivial merge