Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000 (14:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000 (14:34 +1000)
(This used to be commit 0e429dd1fb15137a2a7c25e051b9af8c4ed8c7f3)


Trivial merge