Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:43 +0000 (16:15 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:43 +0000 (16:15 +1000)
(This used to be commit a93b20b85b7b35965c428f1543cb7bbe96e16d42)


Trivial merge