Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commited7322dcfa6f42743b784246f5de74d4e64b0765
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:31:47 +0000 (15 10:31 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:31:47 +0000 (15 10:31 -0800)
tree6f2bd5cdc86e0ddae409947a80151184fa15a8a6
parent6e17a56039be13ac1ef7004f15d154141bad7196
parentecbe08897c9cc47790f3d4f5680d25202bc0f6c3
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test