Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 02:39:59 +0000 (13:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 02:39:59 +0000 (13:39 +1100)
commitc818469d3653b8b2d86c6eb1a8f24887e81fe3b3
treedef5700907aad9ce72ae86172d4eae9c2ed62015
parent786deaf9288c77b40892d6639113e580a7be6904
parent459a8f5a22cbf0daf38a2d366f3eba03eaa06d31
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit 7d1e922a6879110b7953de7560cc4b51ff36ea10)