Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit6a965e72a8650b275222548445d10b65aa61e765
authorJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (11 17:24 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (11 17:24 -0700)
treea04c7f2c3fcd5738f2345a3627edeb93721ab082
parent43b0254d93540eeaddaa32d76dd9271f4dc2ebff
parent8a87e402701494ba1c9d56a9febe3e5c25dc2bf7
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test