Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sun, 11 Nov 2007 21:18:22 +0000 (13:18 -0800)
committerJeremy Allison <jra@samba.org>
Sun, 11 Nov 2007 21:18:22 +0000 (13:18 -0800)
commita084eae03989957ad2cc4a9705697ca6c422b25c
tree1e6a286860758d90923b42626a3d316550058ac6
parent63d141d4e8b6fa0977b9b89545e9cf8bc694f416
parentf976f5e067e48a10178ff296d343ef5007695848
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit b9d79fb509a6c59fdd73b016be5f4da3435c7789)