Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 06:09:10 +0000 (16:09 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 06:09:10 +0000 (16:09 +1000)
commitfd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5
tree6e6b4079ecf50b42b862d0f8accc392e5f061cb8
parentaf82204f4355ac9011b61019bbbe40e7e3632d4c
parent8172f3eb220575d40f9ab5129d36e4e0003dee56
Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit d7f3348c891e14de0e1b195714468ff998400f60)