Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
commit88c9200b7802954ce8aac82901ab7aec1fa8330a
authorAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 05:32:42 +0000 (29 15:32 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 05:32:42 +0000 (29 15:32 +1000)
treefa3fa9d21028ad221319563b6515b9699cf857e1
parent1854ab058b42ce4530324cb8f40eb64e6e32267b
parentb4aa957ae1b87677fbe1583eeab16936f6cd1124
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local