Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit6efb624135a672babaad1459ff1f21b61281780e
authorJeremy Allison <jra@samba.org>
Tue, 17 Mar 2009 21:49:00 +0000 (17 14:49 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 17 Mar 2009 21:49:00 +0000 (17 14:49 -0700)
treeafb9c5f2fe98e82e26458d0eecd62e1cf471ce78
parent8ffe7b07df753568d960155c27d57de2bd99993f
parente6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test