Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitef2913a66c3888d4813d8b778ddd63b2c7e48f3e
authorJeremy Allison <jra@samba.org>
Fri, 25 Jan 2008 00:16:40 +0000 (24 16:16 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 25 Jan 2008 00:16:40 +0000 (24 16:16 -0800)
tree97a08aa7461b7bb4ea2159c4331b0528e86aa932
parent58cfa4b1bdc1ce30cc3befb342cc98ac0e283585
parentd4a9e46edf7336f673c001c559af96eb0ecf9f6f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test