Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commitbb8f098cdfd902bbb36426df2c4f8532881b3fcd
authorJeremy Allison <jra@samba.org>
Mon, 5 May 2008 23:29:21 +0000 (5 16:29 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 5 May 2008 23:29:21 +0000 (5 16:29 -0700)
tree82d0a76c0471b95156b4fdc6efd475f0da84fe8a
parent0a1fe8d6013d925ab6695f6b7f189b731ec42ccc
parent425ca59cce886daed0d6c63fe4382aee140c9518
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test