Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit1d9d39525a1f1f5e43e86d919f1ced2df568f676
authorJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:15:12 +0000 (28 02:15 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:15:12 +0000 (28 02:15 -0800)
treeff889f02881a09fec6738995e316285f9f847a29
parent7bf4216644187549697caace4a2a48803b57fa5a
parentc0f486dc46fa9a8ace03e6d147e5fdbd4d6e2f2d
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test