Merge branch '4-0-local' into v4-0-stable
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 09:34:11 +0000 (19:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 09:34:11 +0000 (19:34 +1000)
commit91643773b8ff0727b40a230b7c41288f57e6a9cb
treee66c67ccdf94b411cd347663234b50ed8d1c1a92
parent89c12dfd4e4594736207cda276d1b10e4bb3b26b
parentb3e202ef8cf797a79cf2b2de863db9fcc7d3b1c3
Merge branch '4-0-local' into v4-0-stable
(This used to be commit dc238848b3987a187212bd8088916c5b34755b0f)