Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 02:21:34 +0000 (18:21 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 02:21:34 +0000 (18:21 -0800)
commit1172260b397e22adddff94f4b364261e8058ebdd
tree222d5159bbed13fa782854f380733483848137d1
parentc76e4791d3ae4f180fba209c29bd3774c00858cf
parent22b21f63d9ebd6181d9ff577ec27e33982db85db
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test