Merge branch 'v4-0-test' of ssh://jra@git.samba.org/data/git/samba into v4-0-test
authorJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 04:25:03 +0000 (21:25 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 04:25:03 +0000 (21:25 -0700)
commit238679edfa8aabff0e5b25922aee712673be2542
treed1859e14cd0a48644e725cf4615aabe265afa7bb
parentbc731db85423a1f2d8dd8d205c702e49ea9347f3
parent9bc4d3ecba6395be2dff195fdc1ae74d07155a42
Merge branch 'v4-0-test' of ssh://jra@git.samba.org/data/git/samba into v4-0-test
(This used to be commit 7cd0977a28e9973ff71e9e0146fef6e6771a72b5)