Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 29 Feb 2008 14:56:06 +0000 (06:56 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 29 Feb 2008 14:56:06 +0000 (06:56 -0800)
commite7406822d32d5b36d3706144efbd1eaa7c44cead
tree2b5ea0e74584b36aada6cb5eca13982a3de33a7d
parentfa12667ec284fdda45b79cbf6bf548ab0faae34f
parentf673bbd300d972dd7ae2d092b3b1e642ed29cfd2
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test