Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorHerb Lewis <herb@samba.org>
Thu, 4 Sep 2008 21:48:27 +0000 (14:48 -0700)
committerHerb Lewis <herb@samba.org>
Thu, 4 Sep 2008 21:48:27 +0000 (14:48 -0700)
(This used to be commit 0311d171970e888754cf614adfdfc1f8e0f5b04e)


Trivial merge