Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commitc6930a0b40a95294931888e8749be8cf90f50ac9
authorJeremy Allison <jra@samba.org>
Fri, 8 Aug 2008 21:33:55 +0000 (8 14:33 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 8 Aug 2008 21:33:55 +0000 (8 14:33 -0700)
treeea52e0bf88b9404b9497c611733efcbcdb8eeace
parente8c7ff3e880c7c7e696c5ba7baa8536b4ea7cb89
parentf698952a39bf4cc735bea31b64fb90e979ec0907
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit 5b3579b14cd5ea6e67ff3c91f5bed155d944c049)