Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 20:59:36 +0000 (12:59 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 20:59:36 +0000 (12:59 -0800)
commite49c28e604d88e8ab49d8a704d6fc79096dd0bae
treec23bd38fa6ddb277b7841c4bfe799ed004f753b4
parent9254bb4ef1c3c3a52ea8e935edb0e7a86ec3ea7a
parent2f195e52fa0eb656c40be4b0ba5b7de4acd18c05
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 16224e8f4f22a8db0ed278d741a7706967f55335)