Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 17:32:42 +0000 (19:32 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 17:32:42 +0000 (19:32 +0200)
(This used to be commit 0f0c8519b87481e3473a469cefd51c76b4a7632e)


Trivial merge