Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Tue, 4 Nov 2008 09:35:13 +0000 (01:35 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 4 Nov 2008 09:35:13 +0000 (01:35 -0800)
commitde16b8982f76e82ffd00d3ad66b24d239c5e8c9f
tree13fc6f16d72d0e6f58b83cdccf8cbae987cadd9a
parentcc8207790ef2fc38635415501a83a0161d48015a
parente20631897d5bade7827845c18ebf13ba468747fc
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test