Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commita3c5ac0de490b6e34caaf840542553586489b30c
authorJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 00:04:12 +0000 (21 16:04 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 00:04:12 +0000 (21 16:04 -0800)
tree82d05776d8043f63f98a2a676a3b1f1fc2838c1f
parente8eabd9275389799f7ec9fcf62ff864aeea6312c
parentcfc77901cace0f6ce241a5873148092e4edac4de
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test