Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 2 Nov 2007 19:06:15 +0000 (12:06 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 2 Nov 2007 19:06:15 +0000 (12:06 -0700)
commitf2a63dccabcd82ce2ae1cf0df5ce824c7ab63fc2
tree5b451870179ee06683def1a8c12e686abae92504
parentb04312b75dc6301e8dbbe4cc3024c4300092b92f
parent8a33035038d176ca3065daf2ff4f1c93464d5e9c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 319dfbaf1b8d08171731d4575127f4bb5255a229)