Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 9 Jul 2008 00:44:57 +0000 (20:44 -0400)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 9 Jul 2008 00:44:57 +0000 (20:44 -0400)
(This used to be commit 2dab9ad77954dc608f8910bf4d3cb92fcaad5cb6)


Trivial merge