Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 14:53:36 +0000 (16:53 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 14:53:36 +0000 (16:53 +0200)
(This used to be commit c73a3b837ec16fbb846c6e63a45599fca99b3d0b)


Trivial merge