Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (18:39 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (18:39 +1000)
commit93cf0b3c7e6d8a4758c44519de51e51be89f76c7
tree9bdba4c32494aba6553f431a5e997567497d8575
parent115053ea7e70b067e7873668ed83f1f10908287d
parent8a2f9688275aa150b739b5525e738df15c5e25cc
Merge commit 'origin/v4-0-test' into v4-0-test