Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:19:47 +0000 (10:19 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:19:47 +0000 (10:19 -0800)
commit9c63e1820bab51a7cc09878d78ddce061c3292ec
tree9e88fcb9ad8012e26c1e70b9e0a07b1f23f9e39f
parent19e4e99bfb02b8fa722883b04237ad714d402cb3
parentee8cf0ce40820b3e1ec025339f2b25c0001fda13
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 6e17a56039be13ac1ef7004f15d154141bad7196)