Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 05:32:42 +0000 (15:32 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 05:32:42 +0000 (15:32 +1000)
commitea039105b2b728c2a5713800c4c3165fc5f3e575
treef579b34c85a539c4622614df2c9eb13fa4df1ee9
parent844a7ad15a8c91cbdfae3ead747c16eeae1e2f96
parent8bd5095aa3bcd79d4063067180b1c1f60f351982
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit 88c9200b7802954ce8aac82901ab7aec1fa8330a)