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)
commitd7f3348c891e14de0e1b195714468ff998400f60
treebd8acd57e905ac38154698abbf7a30caac9904b1
parentc38658c6c05fd65d729693904d35886431582537
parent761e667e45475d3a7d5a41558b400ba4c94c4650
Merge commit 'origin/v4-0-test' into v4-0-test