Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 21:24:41 +0000 (13:24 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 21:24:41 +0000 (13:24 -0800)
commit3a62a177ba758b325ab98e9d77d302bc382e0df8
treeab07ddaa2209ab63d3e77ad6d6eec0216257c6c2
parent25a0084af5978cc11cf4e83a641bc57e0e64eb89
parent7d9d2de39072b3291b95ac3965df0d19f83792b9
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test