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)
(This used to be commit 7d1e922a6879110b7953de7560cc4b51ff36ea10)


Trivial merge