Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 06:19:20 +0000 (17:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 06:19:20 +0000 (17:19 +1100)
(This used to be commit ee6539e4cab8882faafff17f458df91cba352f8e)


Trivial merge