Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000 (14:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000 (14:34 +1000)
commit40ff67e4546780f422c01bb487921d93ac809def
tree4428dc977d302fd20304a87c80a917f03c8d3cd9
parent3a29c33e821b78cad8b586c944fd182d363eda93
parent25ea110c3814abcb824adb3619a44622ba8d2936
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit 0e429dd1fb15137a2a7c25e051b9af8c4ed8c7f3)