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

Trivial merge