Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
authorJeremy Allison <jra@samba.org>
Thu, 4 Sep 2008 18:51:55 +0000 (11:51 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 4 Sep 2008 18:51:55 +0000 (11:51 -0700)
(This used to be commit 98b2fbef5273b055242e24490736b0c9677b1732)


Trivial merge