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)
commit8c9bbbae96c247f9c05f085f771d30573e41c687
tree7f562803c6509090bdbd5ced716ab14621ac2334
parent31262a59bcf1cb04631c2efca169e417ef597bec
parent272690bda864d04e9e95e103393fb51d1affc334
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
(This used to be commit 2dab9ad77954dc608f8910bf4d3cb92fcaad5cb6)