Merge branch '4-0-stable' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 11:54:01 +0000 (21:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 11:54:01 +0000 (21:54 +1000)
commit5d2dea38d6bb0e2643ffcecaada0df9ac6a42050
treee66c67ccdf94b411cd347663234b50ed8d1c1a92
parentb3e202ef8cf797a79cf2b2de863db9fcc7d3b1c3
parentd4942363bad0488e38c8a42252e060591d6615a9
Merge branch '4-0-stable' into 4-0-local
(This used to be commit 857df6e91874407f70436749e3dad13ada003e6e)