Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 11 Jan 2008 00:36:05 +0000 (16:36 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 11 Jan 2008 00:36:05 +0000 (16:36 -0800)
commit6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57
tree90f31e435fac5c882591305e7ff1ff4377eec266
parentf33f4ef4a24fcbf09eeba0d51e7db74e9b13b432
parentfef9cf00e1e110ff5872f1c368d080fe4f7939d6
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 767e0164adf8803df50b0b7bd8e81d25af72bb78)